建筑评分管理模块相关接口开发

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/MybatisGeneratorUtils.java

@@ -71,7 +71,7 @@ public class MybatisGeneratorUtils {
         // strategy.setTablePrefix("t_"); // 表名前缀
         strategy.setEntityLombokModel(true); //使用lombok
         //修改自己想要生成的表
-        strategy.setInclude("dem_build_score");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("dem_build_score_risk");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/DemBuildScoreRiskController.java

@@ -0,0 +1,36 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.service.DemBuildScoreRiskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 建筑评分风险类型 前端控制器
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@RestController
+@RequestMapping("/demBuildScoreRisk")
+public class DemBuildScoreRiskController {
+
+    @Autowired
+    private DemBuildScoreRiskService demBuildScoreRiskService;
+
+    /**
+     * 建筑评分管理-风险类型下拉框
+     *
+     * @return
+     */
+    @GetMapping("demBuildScoreRiskList")
+    public ApiResult<Object> demBuildScoreRiskList() {
+        return ApiResult.success(demBuildScoreRiskService.demBuildScoreRiskList());
+    }
+}
+

service-fire/service-fire-biz/src/main/java/com/usky/fire/domain/DemBuildScoreRisk.java

@@ -0,0 +1,56 @@
+package com.usky.fire.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 建筑评分风险类型
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DemBuildScoreRisk implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 风险类型名称
+     */
+    private String riskTypeName;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/DemBuildScoreRiskMapper.java

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.DemBuildScoreRisk;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 建筑评分风险类型 Mapper 接口
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+public interface DemBuildScoreRiskMapper extends CrudMapper<DemBuildScoreRisk> {
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/DemBuildScoreRiskService.java

@@ -0,0 +1,24 @@
+package com.usky.fire.service;
+
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemBuildScoreRisk;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 建筑评分风险类型 服务类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+public interface DemBuildScoreRiskService extends CrudService<DemBuildScoreRisk> {
+
+    /**
+     * 建筑评分管理-风险类型下拉框
+     *
+     * @return
+     */
+    List<Object> demBuildScoreRiskList();
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemBuildScoreRiskServiceImpl.java

@@ -0,0 +1,43 @@
+package com.usky.fire.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.DemBuildScoreRisk;
+import com.usky.fire.mapper.DemBuildScoreRiskMapper;
+import com.usky.fire.service.DemBuildScoreRiskService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 建筑评分风险类型 服务实现类
+ * </p>
+ *
+ * @author JCB
+ * @since 2022-09-06
+ */
+@Service
+public class DemBuildScoreRiskServiceImpl extends AbstractCrudService<DemBuildScoreRiskMapper, DemBuildScoreRisk> implements DemBuildScoreRiskService {
+
+    @Override
+    public List<Object> demBuildScoreRiskList(){
+        List<Object> list = new ArrayList<>();
+        List<DemBuildScoreRisk> list1 = this.list();
+        if (CollectionUtils.isNotEmpty(list1)){
+            for (int i = 0; i < list1.size(); i++) {
+                Map<String, Object> map = new HashMap<>();
+                map.put("id",list1.get(i).getId());
+                map.put("riskTypeName",list1.get(i).getRiskTypeName());
+                list.add(map);
+            }
+        }
+        return list;
+    }
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReservePlanServiceImpl.java

@@ -69,6 +69,8 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
         ReservePlan reservePlan = new ReservePlan();
         reservePlan.setId(id);
         reservePlan.setEnable(3);
+        reservePlan.setUpdatePerson(SecurityUtils.getUsername());
+        reservePlan.setUpdateTime(LocalDateTime.now());
         this.updateById(reservePlan);
     }
 
@@ -79,6 +81,7 @@ public class ReservePlanServiceImpl extends AbstractCrudService<ReservePlanMappe
         LambdaQueryWrapper<ReservePlan> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.select(ReservePlan::getId, ReservePlan::getReserveName, ReservePlan::getReserveUrl, ReservePlan::getReserveType,
                 ReservePlan::getCreator, ReservePlan::getCreateTime, ReservePlan::getCompanyId)
+                .eq(ReservePlan::getEnable, 1)
                 .eq(ReservePlan::getCreator, SecurityUtils.getUsername())
                 .like(StringUtils.isNotBlank(reserveName), ReservePlan::getReserveName, reserveName)
                 .between(StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate), ReservePlan::getCreateTime, startDate, endDate);

service-fire/service-fire-biz/src/main/resources/mapper/fire/DemBuildScoreRiskMapper.xml

@@ -0,0 +1,15 @@
+<?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.usky.fire.mapper.DemBuildScoreRiskMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.DemBuildScoreRisk">
+        <id column="id" property="id" />
+        <result column="risk_type_name" property="riskTypeName" />
+        <result column="creator" property="creator" />
+        <result column="create_time" property="createTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="update_time" property="updateTime" />
+    </resultMap>
+
+</mapper>