森林防火框架

rentaiming

2024-06-25 a41f6fbfc108e79bfd31126217f0bcfd493d4e52

森林防火框架

 .idea/compiler.xml

@@ -2,6 +2,7 @@
<project version="4">
  <component name="CompilerConfiguration">
    <annotationProcessing>
      <profile default="true" name="Default" enabled="true" />
      <profile name="Maven default annotation processors profile" enabled="true">
        <sourceOutputDir name="target/generated-sources/annotations" />
        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />

 .idea/uiDesigner.xml

New file
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
  <component name="Palette2">
    <group name="Swing">
      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
      </item>
      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
      </item>
      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
        <initial-values>
          <property name="text" value="Button" />
        </initial-values>
      </item>
      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="RadioButton" />
        </initial-values>
      </item>
      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="CheckBox" />
        </initial-values>
      </item>
      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
        <initial-values>
          <property name="text" value="Label" />
        </initial-values>
      </item>
      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
          <preferred-size width="150" height="-1" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
          <preferred-size width="150" height="50" />
        </default-constraints>
      </item>
      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
          <preferred-size width="200" height="200" />
        </default-constraints>
      </item>
      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
          <preferred-size width="200" height="200" />
        </default-constraints>
      </item>
      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
      </item>
      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
      </item>
      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
      </item>
      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
          <preferred-size width="-1" height="20" />
        </default-constraints>
      </item>
      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
      </item>
      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
      </item>
    </group>
  </component>
</project>

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -124,7 +124,7 @@
    /**
     * 角色类型 1=平台 2=公司 3=门店 4=修理厂
     */
    @ApiModelProperty(value = "角色类型 1=平台 2=公司 3=门店 4=修理厂", hidden = true)
    @ApiModelProperty(value = "角色类型  1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位", hidden = true)
    private Integer roleType;

    @Excel(name = "密码修改时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
@@ -143,6 +143,44 @@
    @ApiModelProperty(value = "是否为拍卖师 1=否 2=是")
    @TableField(exist = false)
    private Integer isAuctioneer;

    @ApiModelProperty(value = "供应商联系人")
    private String contacts;

    /** 所属省名称 */
    @TableField("province_name")
    private String provinceName;

    /** 所属省code */
    @TableField("province_code")
    private String provinceCode;

    /** 城市名称 */
    @TableField("city_name")
    private String cityName;

    /** 城市code */
    @TableField("city_code")
    private String cityCode;

    /** 所属区县名称 */
    @TableField("county_name")
    private String countyName;

    /** 所属区县code */
    @TableField("county_code")
    private String countyCode;

    /** 所属街道名称 */
    @TableField("town_name")
    private String townName;

    /** 所属街道code */
    @TableField("town_code")
    private String townCode;



    @Override
    public String getRemark() {
        return remark;

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlRegionController.java

New file
@@ -0,0 +1,36 @@
package com.ruoyi.management.controller;


import com.ruoyi.common.core.domain.R;
import com.ruoyi.management.domain.vo.RegionVo;
import com.ruoyi.management.service.SlRegionService;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import javax.imageio.spi.RegisterableService;
import java.util.List;

/**
 * <p>
 * 省市区4级联动 前端控制器
 * </p>
 *
 * @author hjl
 * @since 2024-06-25
 */
@RestController
@RequestMapping("/sl-region")
public class SlRegionController {
    @Resource
    private SlRegionService regionService;
    @PostMapping("/getRegione")
    @ApiOperation(value = "获取四级联动的地址")
    public R<List<RegionVo>> getRegione() {
        return R.ok(regionService.listRegionVo());
    }

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlRegion.java

New file
@@ -0,0 +1,63 @@
package com.ruoyi.management.domain;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

/**
 * <p>
 * 省市区三级联动
 * </p>
 *
 * @author hjl
 * @since 2024-06-25
 */
@Getter
@Setter
@TableName("sl_region")
@ApiModel(value = "SlRegion对象", description = "省市区三级联动")
public class SlRegion {

    @ApiModelProperty("主键ID")
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;

    @ApiModelProperty("城市名称")
    @TableField("name")
    private String name;

    @ApiModelProperty("code")
    @TableField("code")
    private String code;

    @ApiModelProperty("城市code")
    @TableField("citycode")
    private String citycode;

    @ApiModelProperty("父级ID")
    @TableField("parent_id")
    private String parentId;

    @ApiModelProperty("英文名称")
    @TableField("english")
    private String english;

    @ApiModelProperty("等级")
    @TableField("level")
    private Integer level;

    @ApiModelProperty("层级")
    @TableField("hierarchy")
    private String hierarchy;

    @ApiModelProperty("区域全称")
    @TableField("all_name")
    private String allName;


}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlStoreManagement.java

@@ -63,10 +63,8 @@
    private Integer competentId;

    @ApiModelProperty("主管id")
    @TableField("administrator
_id")
    private Integer administrator
Id;
    @TableField("administrator_id")
    private Integer administratorId;

    @ApiModelProperty("仓库地址")
    @TableField("store_management_adder")

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRk.java

@@ -72,9 +72,7 @@
    @TableField("update_time")
    private Date updateTime;

    @ApiModelProperty("供应商id")
    @TableField("supplier_id")
    private Integer supplierId;


    @ApiModelProperty("附件")
    @TableField("attachment")

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java

@@ -71,5 +71,8 @@
    @TableField("audit_status")
    private Integer auditStatus;

    @ApiModelProperty("供应商id")
    @TableField("supplier_id")
    private Integer supplierId;

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/RegionVo.java

New file
@@ -0,0 +1,32 @@
package com.ruoyi.management.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
public class RegionVo {

    @ApiModelProperty(value = "区域代码")
    private String value;

    @ApiModelProperty(value = "区域名称")
    private String label;

    @ApiModelProperty(value = "子级列表")
    private List<RegionVo> children;

    @ApiModelProperty(value = "id")
    private Long id;

    @ApiModelProperty(value = "父级id")
    private Long parentId;

    @ApiModelProperty(value = "层级")
    private Integer level;

    @ApiModelProperty("code")
    private String code;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/mapper/SlRegionMapper.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.management.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.vo.RegionVo;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * <p>
 * 省市区三级联动 Mapper 接口
 * </p>
 *
 * @author hjl
 * @since 2024-06-25
 */
@Mapper
public interface SlRegionMapper extends BaseMapper<SlRegion> {
    List<RegionVo> listRegionVo();
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlRegionService.java

New file
@@ -0,0 +1,22 @@
package com.ruoyi.management.service;


import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.vo.RegionVo;

import java.util.List;

/**
 * <p>
 * 省市区三级联动 服务类
 * </p>
 *
 * @author hjl
 * @since 2024-06-25
 */
public interface SlRegionService extends IService<SlRegion> {
    List<RegionVo> listRegionVo();


}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java

New file
@@ -0,0 +1,103 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.vo.RegionVo;
import com.ruoyi.management.mapper.SlRegionMapper;
import com.ruoyi.management.service.SlRegionService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;

/**
 * <p>
 * 省市区三级联动 服务实现类
 * </p>
 *
 * @author hjl
 * @since 2024-06-25
 */
@Service
public class SlRegionServiceImpl extends ServiceImpl<SlRegionMapper, SlRegion> implements SlRegionService {

    @Resource
    private  SlRegionMapper slRegionMapper;
    @Override
    public List<RegionVo> listRegionVo() {
        List<RegionVo> regionVoList = slRegionMapper.listRegionVo();
        List<RegionVo> regionVoList1 = new ArrayList<>();
        List<RegionVo> regionVoList2 = new ArrayList<>();
        List<RegionVo> regionVoList3 = new ArrayList<>();
        List<RegionVo> regionVoList4 = new ArrayList<>();
        // 将地区按照级别分别存放到不同的列表中
        for (RegionVo regionVo : regionVoList) {
            if (regionVo.getLevel() == 1) {
                regionVoList1.add(regionVo);
            }
            if (regionVo.getLevel() == 2) {
                regionVoList2.add(regionVo);
            }
            if (regionVo.getLevel() == 3) {
                regionVoList3.add(regionVo);
            }
            if (regionVo.getLevel() == 4) {
                regionVoList3.add(regionVo);
            }
        }


        Iterator<RegionVo> regionVoIterator4;
        RegionVo children;
        // 将第二级地区挂到第一级地区下面
        for (RegionVo regionVo : regionVoList3) {
            if (null == regionVo.getChildren()) {
                regionVo.setChildren(new ArrayList<>());
            }
            regionVoIterator4 = regionVoList4.iterator();
            while (regionVoIterator4.hasNext()) {
                children = regionVoIterator4.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator4.remove();
                }
            }
        }


        Iterator<RegionVo> regionVoIterator3;

        // 将第三级地区挂到第二级地区下面
        for (RegionVo regionVo : regionVoList2) {
            if (null == regionVo.getChildren()) {
                regionVo.setChildren(new ArrayList<>());
            }
            regionVoIterator3 = regionVoList3.iterator();
            while (regionVoIterator3.hasNext()) {
                children = regionVoIterator3.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator3.remove();
                }
            }
        }
        Iterator<RegionVo> regionVoIterator2;
        // 将第二级地区挂到第一级地区下面
        for (RegionVo regionVo : regionVoList1) {
            if (null == regionVo.getChildren()) {
                regionVo.setChildren(new ArrayList<>());
            }
            regionVoIterator2 = regionVoList2.iterator();
            while (regionVoIterator2.hasNext()) {
                children = regionVoIterator2.next();
                if (regionVo.getCode().equals(children.getParentId())) {
                    regionVo.getChildren().add(children);
                    regionVoIterator2.remove();
                }
            }
        }
        // 返回处理后的地区列表
        return regionVoList1;
    }
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/util/GeneratorCodeConfig.java

@@ -65,7 +65,7 @@
                                // 父包模块名 注释即为无
//                         .moduleName(scanner("模块名"))
                                // Entity 包名
                                .entity("entity")
                                .entity("domain")
                                // Service 包名
                                .service("service")
                                // Service Impl 包名

 ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlRegionMapper.xml

New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.rouyi.management.mapper.SlRegionMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.rouyi.management.domain.SlRegion">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="code" property="code" />
        <result column="citycode" property="citycode" />
        <result column="parent_id" property="parentId" />
        <result column="english" property="english" />
        <result column="level" property="level" />
        <result column="hierarchy" property="hierarchy" />
        <result column="all_name" property="allName" />
    </resultMap>

    <select id="listRegionVo" resultType="com.ruoyi.member.domain.vo.RegionVo">
        SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code value, tr.name label
        FROM t_region tr
    </select>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditMapper.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlAuditMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAudit">
        <id column="id" property="id" />
        <result column="rk_id" property="rkId" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="state" property="state" />
        <result column="type" property="type" />
        <result column="cause" property="cause" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlAuditRecordMapper.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlAuditRecordMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlAuditRecord">
        <id column="id" property="id" />
        <result column="audit_id" property="auditId" />
        <result column="shenh_id" property="shenhId" />
        <result column="type" property="type" />
        <result column="state" property="state" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlEquipmentMapper.xml

New file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlEquipmentMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlEquipment">
        <id column="id" property="id" />
        <result column="equipment_name" property="equipmentName" />
        <result column="equipment_num" property="equipmentNum" />
        <result column="type" property="type" />
        <result column="management_id" property="managementId" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsMaterialsMapper.xml

New file
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlGoodsMaterialsMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsMaterials">
        <id column="id" property="id" />
        <result column="goods_materials_name" property="goodsMaterialsName" />
        <result column="is_consume" property="isConsume" />
        <result column="repertory" property="repertory" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="repertory_sum" property="repertorySum" />
        <result column="repertory_zhai" property="repertoryZhai" />
        <result column="repertory_chu" property="repertoryChu" />
        <result column="repertory_yishi" property="repertoryYishi" />
        <result column="check_num" property="checkNum" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlGoodsShelfMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlGoodsShelfMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlGoodsShelf">
        <id column="id" property="id" />
        <result column="goods_shelf_name" property="goodsShelfName" />
        <result column="store_management_id" property="storeManagementId" />
        <result column="is_store_management" property="isStoreManagement" />
        <result column="img_id" property="imgId" />
        <result column="zb_x" property="zbX" />
        <result column="zb_y" property="zbY" />
        <result column="store_management_number" property="storeManagementNumber" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementImgMapper.xml

New file
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlStoreManagementImgMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagementImg">
        <id column="id" property="id" />
        <result column="img_url" property="imgUrl" />
        <result column="store_management_number" property="storeManagementNumber" />
        <result column="store_management_id" property="storeManagementId" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlStoreManagementMapper.xml

New file
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlStoreManagementMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlStoreManagement">
        <id column="id" property="id" />
        <result column="store_management_name" property="storeManagementName" />
        <result column="store_management_no" property="storeManagementNo" />
        <result column="store_management_number" property="storeManagementNumber" />
        <result column="store_management_grade" property="storeManagementGrade" />
        <result column="store_management_city" property="storeManagementCity" />
        <result column="store_management_county" property="storeManagementCounty" />
        <result column="store_management_village" property="storeManagementVillage" />
        <result column="director_id" property="directorId" />
        <result column="competent_id" property="competentId" />
        <result column="administrator
_id" property="administrator
Id" />
        <result column="store_management_adder" property="storeManagementAdder" />
        <result column="store_management_explain" property="storeManagementExplain" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkMapper.xml

New file
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCk">
        <id column="id" property="id" />
        <result column="materials_id" property="materialsId" />
        <result column="rk_id" property="rkId" />
        <result column="ck_num" property="ckNum" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="supplier_id" property="supplierId" />
        <result column="attachment" property="attachment" />
        <result column="source" property="source" />
        <result column="remark" property="remark" />
        <result column="state" property="state" />
        <result column="guih_num" property="guihNum" />
        <result column="type" property="type" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionCkglMapper.xml

New file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionCkglMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionCkgl">
        <id column="id" property="id" />
        <result column="sys_id" property="sysId" />
        <result column="management_id" property="managementId" />
        <result column="starti_time" property="startiTime" />
        <result column="end_time" property="endTime" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="present_state" property="presentState" />
        <result column="audit_status" property="auditStatus" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkMapper.xml

New file
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRk">
        <id column="id" property="id" />
        <result column="materials_id" property="materialsId" />
        <result column="rk_num" property="rkNum" />
        <result column="rk_model" property="rkModel" />
        <result column="rk_pice" property="rkPice" />
        <result column="store_management_number" property="storeManagementNumber" />
        <result column="shelf_id" property="shelfId" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="supplier_id" property="supplierId" />
        <result column="attachment" property="attachment" />
        <result column="source" property="source" />
        <result column="remark" property="remark" />
        <result column="state" property="state" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionRkglMapper.xml

New file
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionRkglMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionRkgl">
        <id column="id" property="id" />
        <result column="sys_id" property="sysId" />
        <result column="management_id" property="managementId" />
        <result column="starti_time" property="startiTime" />
        <result column="end_time" property="endTime" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="present_state" property="presentState" />
        <result column="audit_status" property="auditStatus" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyMapper.xml

New file
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZy">
        <id column="id" property="id" />
        <result column="materials_id" property="materialsId" />
        <result column="rk_id" property="rkId" />
        <result column="zy_num" property="zyNum" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="supplier_id" property="supplierId" />
        <result column="attachment" property="attachment" />
        <result column="source" property="source" />
        <result column="remark" property="remark" />
        <result column="state" property="state" />
        <result column="guih_num" property="guihNum" />
        <result column="type" property="type" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-management/target/classes/mapper/management/SlVolumeProductionZyglMapper.xml

New file
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.management.mapper.SlVolumeProductionZyglMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlVolumeProductionZygl">
        <id column="id" property="id" />
        <result column="sys_id" property="sysId" />
        <result column="management_id" property="managementId" />
        <result column="starti_time" property="startiTime" />
        <result column="end_time" property="endTime" />
        <result column="del_flag" property="delFlag" />
        <result column="create_by" property="createBy" />
        <result column="create_time" property="createTime" />
        <result column="update_by" property="updateBy" />
        <result column="update_time" property="updateTime" />
        <result column="present_state" property="presentState" />
        <result column="audit_status" property="auditStatus" />
        <result column="bmanagement_id" property="bmanagementId" />
    </resultMap>

</mapper>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDeptController.java

@@ -4,6 +4,7 @@
import java.util.List;

import com.ruoyi.system.service.ISysDeptService;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@@ -32,6 +33,7 @@
 */
@RestController
@RequestMapping("/dept")
@Api(tags = "部门模块")
public class SysDeptController extends BaseController
{
    @Autowired

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java

@@ -4,6 +4,7 @@
import javax.servlet.http.HttpServletResponse;

import com.ruoyi.system.domain.SysPost;
import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -31,6 +32,7 @@
 */
@RestController
@RequestMapping("/post")
@Api(tags = "岗位模块")
public class SysPostController extends BaseController
{
    @Autowired

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -23,11 +23,8 @@
import com.ruoyi.system.api.validate.InsertGroup;
import com.ruoyi.system.api.validate.UpdateGroup;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.ResetPwdDTO;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.dto.SysUserDTO;
import com.ruoyi.system.domain.dto.SysUserQuery;
import com.ruoyi.system.domain.dto.*;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
@@ -116,7 +113,7 @@
    public AjaxResult add(@Validated(InsertGroup.class) @RequestBody SysUserDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        user.setUserId(null);
        user.setUserType(dto.getIsAuctioneer() == 1 ? "04" : "00");
        user.setUserType(dto.getIsAuctioneer() == 1 ? "03" : "00");
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
@@ -125,7 +122,7 @@
            return error("手机号已开通账号");
        }
        user.setCreateBy(SecurityUtils.getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        user.setPassword(SecurityUtils.encryptPassword("a123456"));
        user.setRoleType(1);
        int i = userService.insertUser(user);
        SysUserRole sysUserRole = new SysUserRole();
@@ -374,7 +371,7 @@
    @PostMapping("/resetPwd")
    public AjaxResult resetPwd(@RequestBody ResetPwdDTO dto) {
        SysUser user = userService.lambdaQuery().eq(SysUser::getUserId, dto.getUserId())
                .in(SysUser::getUserType, "00", "01").one();
                .in(SysUser::getUserType, "00", "02").one();
        if (StringUtils.isNull(user)) {
            throw new ServiceException("账号不存在");
        }
@@ -571,6 +568,38 @@
        return R.ok();
    }


    @ApiOperation(value = "获取管理员分页列表", notes = "获取管理员分页列表")
    @PostMapping("/conservator-page")
    public R<PageDTO<ConservatorVO>> getConservatorPage(@Validated @RequestBody ConservatorQuery query) {
        return R.ok(userService.getConservatorPage(query));
    }

    /**
     * 添加/编辑供应商
     *
     * @param dto 供应商数据传输对象
     */
    @Log(title = "供应商管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "添加/编辑管理员", notes = "添加/编辑管理员")
    @PostMapping("/save-conservator")
    public R<?> saveConservator(@Validated @RequestBody ConservatorDTO dto) {
        userService.saveConservator(dto);
        return R.ok();
    }

    /**
     * 删除供应商
     *
     * @param id 供应商id
     */
    @ApiOperation(value = "删除供应商", notes = "删除供应商")
    @DeleteMapping("/delete-conservator/{id}")
    public R<?> deleteConservator(@PathVariable("id") Long id) {
        userService.deleteConservator(id);
        return R.ok();
    }

    @InnerAuth
    @GetMapping("/list-by-name")
    R<List<SysUser>> getUserListByName(@RequestBody SysUser sysUser) {

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorDTO.java

New file
@@ -0,0 +1,57 @@
package com.ruoyi.system.domain.dto;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("管理员数据传输对象")
public class ConservatorDTO {
    @ApiModelProperty(value = "管理员id", notes = "更新必传")
    private Long userId;

    @ApiModelProperty("管理员名称")
    private String nickName;

    @ApiModelProperty("管理员联系电话")
    private String phonenumber;

    @ApiModelProperty(value = "1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位", hidden = true)
    private Integer roleType;

    @ApiModelProperty("登录密码")
    private String password;

    /** 所属省名称 */
    @TableField("province_name")
    private String provinceName;

    /** 所属省code */
    @TableField("province_code")
    private String provinceCode;

    /** 城市名称 */
    @TableField("city_name")
    private String cityName;

    /** 城市code */
    @TableField("city_code")
    private String cityCode;

    /** 所属区县名称 */
    @TableField("county_name")
    private String countyName;

    /** 所属区县code */
    @TableField("county_code")
    private String countyCode;

    /** 所属街道名称 */
    @TableField("town_name")
    private String townName;

    /** 所属街道code */
    @TableField("town_code")
    private String townCode;
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/ConservatorQuery.java

New file
@@ -0,0 +1,23 @@
package com.ruoyi.system.domain.dto;

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

import javax.validation.constraints.NotBlank;

@Data
@ApiModel("管理员列表查询数据传输对象")
public class ConservatorQuery extends BasePage {
    @ApiModelProperty("管理员名称")
    private String nickName;

    @ApiModelProperty("联系电话")
    private String phonenumber;

    @ApiModelProperty(value = "1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位", hidden = true)
    private Integer roleType;

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/SupplierDTO.java

@@ -23,6 +23,6 @@
    @NotBlank(message = "联系电话不能为空")
    private String phonenumber;

    @ApiModelProperty("登录密码")
    private String password;
    @ApiModelProperty("联系人")
    private String contacts;
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/ConservatorVO.java

New file
@@ -0,0 +1,57 @@
package com.ruoyi.system.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("管理员视图对象")
public class ConservatorVO {
    @ApiModelProperty("管理员id")
    private Long userId;

    @ApiModelProperty("管理员名称")
    private String nickName;

    @ApiModelProperty("管理员联系电话")
    private String phonenumber;

    @ApiModelProperty(value = "1=平台 2=省级 3=市州级 4=市县级，5 乡镇级，6 经营单位")
    private Integer roleType;

    @ApiModelProperty(value = "用户类型（00=平台 01=供应商  02管理员）")
    private String userType;

    /** 所属省名称 */
    @TableField("province_name")
    private String provinceName;

    /** 所属省code */
    @TableField("province_code")
    private String provinceCode;

    /** 城市名称 */
    @TableField("city_name")
    private String cityName;

    /** 城市code */
    @TableField("city_code")
    private String cityCode;

    /** 所属区县名称 */
    @TableField("county_name")
    private String countyName;

    /** 所属区县code */
    @TableField("county_code")
    private String countyCode;

    /** 所属街道名称 */
    @TableField("town_name")
    private String townName;

    /** 所属街道code */
    @TableField("town_code")
    private String townCode;
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SupplierVO.java

@@ -22,4 +22,9 @@

    @ApiModelProperty("联系电话")
    private String phonenumber;

    @ApiModelProperty("联系人")
    private String contacts;


}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -4,9 +4,16 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.domain.dto.ConservatorDTO;
import com.ruoyi.system.domain.dto.ConservatorQuery;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.ArrayList;
import java.util.List;

@@ -242,4 +249,10 @@
     * @param id 供应商id
     */
    void deleteSupplier(Long id);

    PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query);

    void saveConservator(ConservatorDTO dto);

    void deleteConservator( Long id);
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -17,8 +17,11 @@
import com.ruoyi.system.domain.SysPost;
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.dto.ConservatorDTO;
import com.ruoyi.system.domain.dto.ConservatorQuery;
import com.ruoyi.system.domain.dto.SupplierDTO;
import com.ruoyi.system.domain.dto.SupplierQuery;
import com.ruoyi.system.domain.vo.ConservatorVO;
import com.ruoyi.system.domain.vo.SupplierVO;
import com.ruoyi.system.mapper.SysPostMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -585,7 +588,7 @@
        Page<SysUser> page = this.lambdaQuery()
                .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
                .like(StringUtils.isNotBlank(query.getNickName()
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "04")
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "01")
                .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
@@ -610,10 +613,10 @@
        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            user.setUserName(dto.getPhonenumber());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setUserType("04");
            user.setUserType("01");
            user.setCreateTime(new Date());
            user.setCreateBy(SecurityUtils.getUsername());
            user.setContacts(dto.getContacts());
            this.save(user);
        } else {
            // 编辑
@@ -625,10 +628,8 @@
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setUpdateTime(new Date());
            user.setContacts(dto.getContacts());
            user.setUpdateBy(SecurityUtils.getUsername());
            if (StringUtils.isNotBlank(dto.getPassword())) {
                user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            }
            this.updateById(user);
        }
    }
@@ -642,4 +643,67 @@
    public void deleteSupplier(Long id) {
        this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();
    }


    @Override
    public PageDTO<ConservatorVO> getConservatorPage(ConservatorQuery query) {
        Page<SysUser> page = this.lambdaQuery()
                .select(SysUser::getUserId, SysUser::getNickName, SysUser::getPhonenumber)
                .like(StringUtils.isNotBlank(query.getNickName()
                ), SysUser::getNickName, query.getNickName()).eq(SysUser::getUserType, "02")
                .eq(SysUser::getPhonenumber,query.getPhonenumber()).eq(SysUser::getRoleType,query.getRoleType())
                .eq(SysUser::getDelFlag, "0").orderByDesc(SysUser::getCreateTime)
                .page(new Page<>(query.getPageCurr(), query.getPageSize()));
        if (StringUtils.isEmpty(page.getRecords())) {
            return PageDTO.empty(page);
        }
        return PageDTO.of(page, ConservatorVO.class);
    }

    @Override
    public void saveConservator(ConservatorDTO dto) {
        SysUser user = BeanUtils.copyBean(dto, SysUser.class);
        boolean b = checkPhoneUnique(user);
        if (!b) {
            throw new ServiceException("该手机号已存在");
        }
        // 添加
        if (StringUtils.isNull(dto.getUserId())) {
            user.setNickName(dto.getNickName());
            user.setUserName(dto.getPhonenumber());
            user.setUserType("02");
            user.setCreateTime(new Date());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setCreateBy(SecurityUtils.getUsername());
            user.setProvinceName(dto.getProvinceName());
            user.setProvinceCode(dto.getProvinceCode());
            user.setCityName(dto.getCityCode());
            user.setCityCode(dto.getCityCode());
            user.setCountyName(dto.getCountyName());
            user.setCountyCode(dto.getCountyCode());
            user.setTownName(dto.getTownName());
            user.setTownCode(dto.getTownCode());
            user.setRoleType(dto.getRoleType());
            this.save(user);
        } else {
            // 编辑
            user = this.getById(dto.getUserId());
            if (StringUtils.isNull(user)) {
                throw new ServiceException("管理员不存在");
            }
            user.setNickName(dto.getNickName());
            user.setPhonenumber(dto.getPhonenumber());
            user.setUserName(dto.getPhonenumber());
            user.setUpdateTime(new Date());
            user.setPassword(SecurityUtils.encryptPassword(dto.getPassword()));
            user.setUpdateBy(SecurityUtils.getUsername());
            user.setRoleType(dto.getRoleType());
            this.updateById(user);
        }
    }

    @Override
    public void deleteConservator(Long id) {
        this.lambdaUpdate().set(SysUser::getDelFlag, "2").eq(SysUser::getUserId, id).update();
    }
}