wl
2022-09-27 5fc3aab046809ec03d59bd494a0cc91debeec251
违规事项设置 列表和删除
违建事项设置 列表和删除
8个文件已修改
2个文件已添加
249 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/controller/caseHandler/IllegalBuildingController.java
@@ -1,10 +1,18 @@
package com.ycl.controller.caseHandler;
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.api.CommonResult;
import com.ycl.controller.BaseController;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.service.caseHandler.IIllegalBuildingService;
import com.ycl.service.dict.IDataDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
@@ -16,7 +24,38 @@
 * @since 2022-09-24
 */
@RestController
@RequestMapping("/illegal-building")
@RequestMapping("/illegal_building")
@Api(tags = "违建事件类型设置")
public class IllegalBuildingController extends BaseController {
    @Autowired
    IDataDictionaryService iDataDictionaryService;
    /**
     * @Description 查询违建类型
     * @Param [size, current, keyWord]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "查询违建类型")
    @GetMapping("/query")
    public CommonResult searchIllegalBuilding(@RequestParam Integer size,
                                              @RequestParam Integer current,
                                              @RequestParam(required = false) String keyWord) {
        Page<DataDictionary> dataDictionaryPage = new Page<>();
        dataDictionaryPage.setSize(size);
        dataDictionaryPage.setCurrent(current);
        return CommonResult.success(iDataDictionaryService.listIllegalBuildingSettings(dataDictionaryPage,keyWord));
    }
    /**
     * @Description  delete illegal building by id
     * @Param [id]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "删除违建类型")
    @DeleteMapping("/delete")
    public CommonResult removeIllegalBuilding(@RequestParam Integer id){
        return CommonResult.success(iDataDictionaryService.removeById(id));
    }
}
ycl-platform/src/main/java/com/ycl/controller/caseHandler/ViolationsController.java
@@ -1,10 +1,15 @@
package com.ycl.controller.caseHandler;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.service.dict.IDataDictionaryService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
@@ -17,6 +22,36 @@
 */
@RestController
@RequestMapping("/violations")
@Api(tags = "违规事项设置")
public class ViolationsController extends BaseController {
    @Autowired
    IDataDictionaryService iDataDictionaryService;
    /**
     * @Description 查询违建类型
     * @Param [size, current, keyWord]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "查询违规类型")
    @GetMapping("/query")
    public CommonResult searchIllegalBuilding(@RequestParam Integer size,
                                              @RequestParam Integer current,
                                              @RequestParam(required = false) String keyWord) {
        Page<DataDictionary> dataDictionaryPage = new Page<>();
        dataDictionaryPage.setSize(size);
        dataDictionaryPage.setCurrent(current);
        return CommonResult.success(iDataDictionaryService.listViolations(dataDictionaryPage,keyWord));
    }
    /**
     * @Description  delete illegal building by id
     * @Param [id]
     * @return com.ycl.api.CommonResult
     **/
    @ApiOperation(value = "删除违规类型")
    @DeleteMapping("/delete")
    public CommonResult removeIllegalBuilding(@RequestParam Integer id){
        return CommonResult.success(iDataDictionaryService.removeById(id));
    }
}
ycl-platform/src/main/java/com/ycl/entity/store/StoreInfo.java
@@ -8,7 +8,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -29,7 +29,7 @@
@Builder
public class StoreInfo implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("主键")
ycl-platform/src/main/java/com/ycl/entity/store/StoreScoreRule.java
@@ -7,7 +7,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.io.Serial;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -28,7 +27,7 @@
@Builder
public class StoreScoreRule implements Serializable {
    @Serial
    private static final long serialVersionUID = 1L;
    @ApiModelProperty("主键")
ycl-platform/src/main/java/com/ycl/mapper/dict/DataDictionaryMapper.java
@@ -1,6 +1,7 @@
package com.ycl.mapper.dict;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.entity.dict.DataDictionary;
/**
@@ -13,4 +14,7 @@
 */
public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
    Page<DataDictionary> listDataDictionaryPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
    Page<DataDictionary> listViolationPage(Page<DataDictionary> dataDictionaryPage, String keyWord);
}
ycl-platform/src/main/java/com/ycl/service/dict/IDataDictionaryService.java
@@ -1,5 +1,6 @@
package com.ycl.service.dict;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.entity.dict.DataDictionary;
@@ -26,4 +27,8 @@
     * @return
     */
    DataDictionary queryByCode(String code);
    Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWork);
    Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord);
}
ycl-platform/src/main/java/com/ycl/service/dict/impl/DataDictionaryServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.dict.DataDictionary;
import com.ycl.mapper.dict.DataDictionaryMapper;
@@ -52,4 +53,16 @@
        DataDictionary dataDictionary = dataDictionaryMapper.selectOne(queryWrapper);
        return dataDictionary;
    }
    @Override
    public Page listIllegalBuildingSettings(Page<DataDictionary> dataDictionaryPage, String keyWord) {
        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listDataDictionaryPage(dataDictionaryPage,keyWord);
        return dataDictionaryPageList;
    }
    @Override
    public Page listViolations(Page<DataDictionary> dataDictionaryPage, String keyWord) {
        Page<DataDictionary> dataDictionaryPageList = dataDictionaryMapper.listViolationPage(dataDictionaryPage,keyWord);
        return dataDictionaryPageList;
    }
}
ycl-platform/src/main/java/com/ycl/vo/IllegalBuildingSettingVO.java
New file
@@ -0,0 +1,36 @@
package com.ycl.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * <p>
 *
 * </p>
 *
 * @author wl
 * @since 2022-09-27
 */
@Data
@ApiModel("违建事项设置")
public class IllegalBuildingSettingVO {
    /**
     * 违规事项编号
     */
    @ApiModelProperty(value ="违建事项编号" )
    private Integer number;
    /**
     * 所属类型
     */
    @ApiModelProperty(value = "所属类型",dataType = "String")
    private String type;
    /**
     * 所属类别
     */
    @ApiModelProperty(value = "所属类别",dataType = "String")
    private String typeFirst;
}
ycl-platform/src/main/java/com/ycl/vo/ViolationSettingVO.java
New file
@@ -0,0 +1,47 @@
package com.ycl.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
 * <p>
 *
 * </p>
 *
 * @author wl
 * @since 2022-09-27
 */
@Data
@ApiModel("违规事项设置")
public class ViolationSettingVO {
    /**
     * 违规事项编号
     */
    @ApiModelProperty(value ="违规事项编号" )
    private Integer number;
    /**
     * 所属类型
     */
    @ApiModelProperty(value = "所属类型",dataType = "String")
    private String type;
    /**
     * 所属大类
     */
    @ApiModelProperty(value = "所属大类",dataType = "String")
    private String typeFirst;
    /**
     * 所属小类
     */
    @ApiModelProperty(value = "所属小类",dataType = "String")
    private String typeSecond;
    /**
     * 案由
     */
    @ApiModelProperty(value = "案由",dataType = "String")
    private String typeThird;
}
ycl-platform/src/main/resources/mapper/dict/DataDictionaryMapper.xml
@@ -19,4 +19,53 @@
        id, name, code, type_name,type_code,parent_id,level,remark
    </sql>
    <resultMap id="settingsResultMap" type="com.ycl.vo.IllegalBuildingSettingVO">
        <id column="number" property="number" />
        <result column="type" property="type" />
        <result column="typeFirst" property="typeFirst" />
        <result column="typeSecond" property="typeSecond" />
        <result column="typeThird" property="typeThird" />
    </resultMap>
    <select id="listDataDictionaryPage" resultType="com.ycl.vo.IllegalBuildingSettingVO">
        SELECT
        d1.id AS number,
        d1.`name` AS type,
        d2.`name` AS typeFirst
        FROM
        `ums_data_dictionary` AS d1
        JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
        <where>
            d1.`level` = '2'
            AND d1.type_code = '06'
            <if test="keyWord !=null and keyWord !=''">
                AND d1.`name` LIKE  '%${keyWord}%'
            </if>
        </where>
    </select>
    <select id="listViolationPage" resultType="com.ycl.vo.ViolationSettingVO">
        SELECT
        d1.id AS number,
        d1.`name` AS type,
        d2.`name` AS typeFirst,
        d3.`name` AS typeSecond,
        d4.`name` AS typeThird
        FROM
        `ums_data_dictionary` AS d1
        JOIN ums_data_dictionary AS d2 ON d1.parent_id = d2.id
        JOIN ums_data_dictionary AS d3 ON d2.parent_id = d3.id
        JOIN ums_data_dictionary AS d4 ON d3.parent_id = d4.id
        <where>
            d1.`level` = '4'
            AND d1.type_code = '01'
            <if test="keyWord !=null and keyWord !=''">
                AND d1.`name` LIKE  '%${keyWord}%'
            </if>
        </where>
    </select>
</mapper>