wl
2022-11-24 d9652bc766ef9ef3eeaaea784eca948243426915
网格管理
2个文件已修改
6个文件已添加
1 文件已重命名
1个文件已删除
303 ■■■■ 已修改文件
ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/utils/MD5Util.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java 83 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.xml 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-common/src/main/java/com/ycl/controller/constant/SysConst.java
File was renamed from ycl-common/src/main/java/com/ycl/constant/SysConst.java
@@ -1,4 +1,4 @@
package com.ycl.constant;
package com.ycl.controller.constant;
/**
 * 全局常量
ycl-common/src/main/java/com/ycl/utils/MD5Util.java
@@ -99,4 +99,24 @@
        }
        return str;
    }
    public static String md5Encrypt(String string) {
        byte[] hash;
        try {
            //创建一个MD5算法对象,并获得MD5字节数组,16*8=128位
            hash = MessageDigest.getInstance("MD5").digest(string.getBytes("UTF-8"));
        } catch (NoSuchAlgorithmException e) {
            throw new RuntimeException("Huh, MD5 should be supported?", e);
        } catch (UnsupportedEncodingException e) {
            throw new RuntimeException("Huh, UTF-8 should be supported?", e);
        }
        //转换为十六进制字符串
        StringBuilder hex = new StringBuilder(hash.length * 2);
        for (byte b : hash) {
            if ((b & 0xFF) < 0x10) hex.append("0");
            hex.append(Integer.toHexString(b & 0xFF));
        }
        return hex.toString();
    }
}
ycl-common/src/main/java/com/ycl/utils/common/PojoUtils.java
@@ -1,6 +1,6 @@
package com.ycl.utils.common;
import com.ycl.constant.SysConst;
import com.ycl.controller.constant.SysConst;
/**
 * <p>
ycl-platform/src/main/java/com/ycl/controller/epuipment/OrgGridController.java
New file
@@ -0,0 +1,64 @@
package com.ycl.controller.epuipment;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.equipment.OrgGrid;
import com.ycl.service.equipment.IOrgGridService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * <p>
 * 网格管理 前端控制器
 * </p>
 *
 * @author lyq
 * @since 2022-11-24
 */
@RestController
@RequestMapping("/org_grid")
@Api(tags = "网格管理")
public class OrgGridController extends BaseController {
    @Autowired
    IOrgGridService iOrgGridService;
    @GetMapping("/query")
    @ApiOperation(value = "查询网格")
    public CommonResult search(@RequestParam(required = false) String area,
                               @RequestParam Integer size,
                               @RequestParam Integer current) {
        return CommonResult.success(iOrgGridService.page(new Page<>(size, current), new LambdaQueryWrapper<OrgGrid>()
                .like(StringUtils.isNotBlank(area), OrgGrid::getArea, area)));
    }
    @PostMapping("/addition")
    @ApiOperation(value = "添加")
    @LogSave(operationType = "网格管理", contain = "添加")
    public CommonResult add(@RequestBody OrgGrid orgGrid) {
        return CommonResult.success(iOrgGridService.save(orgGrid));
    }
    @DeleteMapping("/deletion")
    @ApiOperation(value = "删除")
    @LogSave(operationType = "网格管理", contain = "删除")
    public CommonResult delete(@RequestParam Integer id) {
        return CommonResult.success(iOrgGridService.removeById(id));
    }
    @GetMapping("/modification")
    @ApiOperation(value = "修改")
    @LogSave(operationType = "网格管理", contain = "修改")
    public CommonResult modify(@RequestBody OrgGrid orgGrid) {
        return CommonResult.success(iOrgGridService.updateById(orgGrid));
    }
}
ycl-platform/src/main/java/com/ycl/entity/equipment/OrgGrid.java
New file
@@ -0,0 +1,58 @@
package com.ycl.entity.equipment;
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 lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
/**
 * <p>
 * 网格管理
 * </p>
 *
 * @author lyq
 * @since 2022-11-24
 */
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("ums_org_grid")
public class OrgGrid implements Serializable {
    private static final long serialVersionUID = 1L;
    /**
     * 主键
     */
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    /**
     * 网格员姓名
     */
    @TableField("worker")
    private String worker;
    /**
     * 联系方式
     */
    @TableField("contact")
    private String contact;
    /**
     * 区域名称
     */
    @TableField("area")
    private String area;
    /**
     * 区域-坐标集合
     */
    @TableField("region")
    private String region;
}
ycl-platform/src/main/java/com/ycl/mapper/equipment/OrgGridMapper.java
New file
@@ -0,0 +1,18 @@
package com.ycl.mapper.equipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ycl.entity.equipment.OrgGrid;
import org.apache.ibatis.annotations.Mapper;
/**
 * <p>
 * 网格管理 Mapper 接口
 * </p>
 *
 * @author lyq
 * @since 2022-11-24
 */
@Mapper
public interface OrgGridMapper extends BaseMapper<OrgGrid> {
}
ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java
File was deleted
ycl-platform/src/main/java/com/ycl/service/equipment/IOrgGridService.java
New file
@@ -0,0 +1,16 @@
package com.ycl.service.equipment;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.equipment.OrgGrid;
/**
 * <p>
 * 网格管理 服务类
 * </p>
 *
 * @author lyq
 * @since 2022-11-24
 */
public interface IOrgGridService extends IService<OrgGrid> {
}
ycl-platform/src/main/java/com/ycl/service/equipment/impl/OrgGridServiceImpl.java
New file
@@ -0,0 +1,21 @@
package com.ycl.service.equipment.impl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.equipment.OrgGrid;
import com.ycl.mapper.equipment.OrgGridMapper;
import com.ycl.service.equipment.IOrgGridService;
import org.springframework.stereotype.Service;
/**
 * <p>
 * 网格管理 服务实现类
 * </p>
 *
 * @author lyq
 * @since 2022-11-24
 */
@Service
public class OrgGridServiceImpl extends ServiceImpl<OrgGridMapper, OrgGrid> implements IOrgGridService {
}
ycl-platform/src/main/resources/mapper/equipment/OrgGridMapper.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.ycl.mapper.equipment.OrgGridMapper">
    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.ycl.entity.equipment.OrgGrid">
        <id column="id" property="id" />
        <result column="worker" property="worker" />
        <result column="contact" property="contact" />
        <result column="area" property="area" />
        <result column="region" property="region" />
    </resultMap>
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, worker, contact, area, region
    </sql>
</mapper>