功能调整，增加

src/main/java/com/lqkj/camera/util/TimerUtil.java

@@ -33,40 +33,40 @@ public class TimerUtil implements CommandLineRunner {
     private CameraInfoService cameraInfoService;
     @Override
     public void run(String... args) throws Exception {
-        timer = new Timer("cameraTimer");
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-
-                if (flag){
-                    logger.info("******   执行定时任务开始自动推流      BEGIN   ******");
-                    flag = false;
-                    List<CameraInfo> cameraInfos = cameraInfoService.selectCameraInfoList(null);
-                    for (CameraInfo cameraInfo : cameraInfos){
-                        CameraVo cameraVo = new CameraVo();
-                        cameraVo.setRtsp(cameraInfo.getUrl());
-                        if (!CameraCacheUtil.STREAMTHREAD.containsKey(cameraInfo.getCameraId())){
-                            String rtmp = "rtmp://" + cameraConfig.getPushHost() + ":" + cameraConfig.getPushPort() + "/hls/" + cameraInfo.getCameraId();
-                            String httpHls = cameraConfig.getHttpFlvHost() + "/hls/" + cameraInfo.getCameraId() + ".m3u8";
-                            cameraVo.setToken(cameraInfo.getCameraId());
-                            cameraVo.setCount(1);
-                            cameraVo.setOpenTime(new Date());
-                            cameraVo.setHttpFlv(httpHls);
-                            cameraVo.setRtmp(rtmp);
-                            CameraThread.MyRunnable job = new CameraThread.MyRunnable(cameraVo);
-                            CameraThread.MyRunnable.es.execute(job);
-                            CameraCacheUtil.STREAMTHREAD.put(cameraInfo.getCameraId(),job);
-                            try {
-                                Thread.sleep(15000);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        }
-                    }
-                    flag = true;
-                    logger.info("******   执行定时任务开始自动推流      END   ******");
-                }
-            }
-        }, 1, 1000 * 60);
+//        timer = new Timer("cameraTimer");
+//        timer.schedule(new TimerTask() {
+//            @Override
+//            public void run() {
+//
+//                if (flag){
+//                    logger.info("******   执行定时任务开始自动推流      BEGIN   ******");
+//                    flag = false;
+//                    List<CameraInfo> cameraInfos = cameraInfoService.selectCameraInfoList(null);
+//                    for (CameraInfo cameraInfo : cameraInfos){
+//                        CameraVo cameraVo = new CameraVo();
+//                        cameraVo.setRtsp(cameraInfo.getUrl());
+//                        if (!CameraCacheUtil.STREAMTHREAD.containsKey(cameraInfo.getCameraId())){
+//                            String rtmp = "rtmp://" + cameraConfig.getPushHost() + ":" + cameraConfig.getPushPort() + "/hls/" + cameraInfo.getCameraId();
+//                            String httpHls = cameraConfig.getHttpFlvHost() + "/hls/" + cameraInfo.getCameraId() + ".m3u8";
+//                            cameraVo.setToken(cameraInfo.getCameraId());
+//                            cameraVo.setCount(1);
+//                            cameraVo.setOpenTime(new Date());
+//                            cameraVo.setHttpFlv(httpHls);
+//                            cameraVo.setRtmp(rtmp);
+//                            CameraThread.MyRunnable job = new CameraThread.MyRunnable(cameraVo);
+//                            CameraThread.MyRunnable.es.execute(job);
+//                            CameraCacheUtil.STREAMTHREAD.put(cameraInfo.getCameraId(),job);
+//                            try {
+//                                Thread.sleep(15000);
+//                            } catch (InterruptedException e) {
+//                                e.printStackTrace();
+//                            }
+//                        }
+//                    }
+//                    flag = true;
+//                    logger.info("******   执行定时任务开始自动推流      END   ******");
+//                }
+//            }
+//        }, 1, 1000 * 60);
     }
 }

src/main/java/com/lqkj/info/entity/ElevatorInfo.java

@@ -39,6 +39,15 @@ public class ElevatorInfo extends BaseEntity
     @Excel(name = "保养次数")
     private Integer upkeepNum;
 
+    /** 电梯类型 */
+    private Integer type;
+
+    /** 运行楼层 */
+    private String runFloor;
+
+    /** 运行时间 */
+    private String runTime;
+
     public void setElevatorId(Integer elevatorId) 
     {
         this.elevatorId = elevatorId;
@@ -94,15 +103,42 @@ public class ElevatorInfo extends BaseEntity
         return upkeepNum;
     }
 
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getRunFloor() {
+        return runFloor;
+    }
+
+    public void setRunFloor(String runFloor) {
+        this.runFloor = runFloor;
+    }
+
+    public String getRunTime() {
+        return runTime;
+    }
+
+    public void setRunTime(String runTime) {
+        this.runTime = runTime;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("elevatorId", getElevatorId())
-            .append("elevatorCode", getElevatorCode())
-            .append("buildingId", getBuildingId())
-            .append("status", getStatus())
-            .append("elevatorName", getElevatorName())
-            .append("upkeepNum", getUpkeepNum())
-            .toString();
+        return "ElevatorInfo{" +
+                "elevatorId=" + elevatorId +
+                ", elevatorCode='" + elevatorCode + '\'' +
+                ", buildingId=" + buildingId +
+                ", status=" + status +
+                ", elevatorName='" + elevatorName + '\'' +
+                ", upkeepNum=" + upkeepNum +
+                ", type=" + type +
+                ", runFloor='" + runFloor + '\'' +
+                ", runTime='" + runTime + '\'' +
+                '}';
     }
 }

src/main/java/com/lqkj/info/entity/EquipmentInfo.java

@@ -53,6 +53,15 @@ public class EquipmentInfo extends BaseEntity
     @Excel(name = "状态")
     private Integer status;
 
+    /** 使用状态 */
+    private Integer deviceStatus;
+
+    /** 设备编号 */
+    private String equipCode;
+
+    /** 品牌 */
+    private Integer brand;
+
     public void setEquipmentId(Integer equipmentId) 
     {
         this.equipmentId = equipmentId;
@@ -144,19 +153,46 @@ public class EquipmentInfo extends BaseEntity
         return status;
     }
 
+    public Integer getDeviceStatus() {
+        return deviceStatus;
+    }
+
+    public void setDeviceStatus(Integer deviceStatus) {
+        this.deviceStatus = deviceStatus;
+    }
+
+    public String getEquipCode() {
+        return equipCode;
+    }
+
+    public void setEquipCode(String equipCode) {
+        this.equipCode = equipCode;
+    }
+
+    public Integer getBrand() {
+        return brand;
+    }
+
+    public void setBrand(Integer brand) {
+        this.brand = brand;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("equipmentId", getEquipmentId())
-            .append("typeId", getTypeId())
-            .append("roomId", getRoomId())
-            .append("buildingId", getBuildingId())
-            .append("areaId", getAreaId())
-            .append("equipmentName", getEquipmentName())
-            .append("lngLat", getLngLat())
-            .append("rasterLngLat", getRasterLngLat())
-            .append("typeName", getTypeName())
-            .append("status", getStatus())
-            .toString();
+        return "EquipmentInfo{" +
+                "equipmentId=" + equipmentId +
+                ", typeId=" + typeId +
+                ", roomId=" + roomId +
+                ", buildingId=" + buildingId +
+                ", areaId=" + areaId +
+                ", equipmentName='" + equipmentName + '\'' +
+                ", lngLat='" + lngLat + '\'' +
+                ", rasterLngLat='" + rasterLngLat + '\'' +
+                ", typeName='" + typeName + '\'' +
+                ", status=" + status +
+                ", deviceStatus=" + deviceStatus +
+                ", equipCode='" + equipCode + '\'' +
+                ", brand=" + brand +
+                '}';
     }
 }

src/main/java/com/lqkj/info/entity/OrganizationInfo.java

@@ -36,6 +36,12 @@ public class OrganizationInfo extends BaseEntity
     @Excel(name = "区域id")
     private Integer areaId;
 
+    /** 产业类型 */
+    private Integer industryType;
+
+    /** 户型 */
+    private Integer houseTypeId;
+
     /** 名称 */
     @Excel(name = "名称")
     private String organizationName;
@@ -79,6 +85,9 @@ public class OrganizationInfo extends BaseEntity
     /** 宣传视频 */
     private String audio;
 
+    /** 楼层 */
+    private Integer floor;
+
     public String getAudio() {
         return audio;
     }
@@ -241,6 +250,30 @@ public class OrganizationInfo extends BaseEntity
         return employeNum;
     }
 
+    public Integer getIndustryType() {
+        return industryType;
+    }
+
+    public void setIndustryType(Integer industryType) {
+        this.industryType = industryType;
+    }
+
+    public Integer getFloor() {
+        return floor;
+    }
+
+    public void setFloor(Integer floor) {
+        this.floor = floor;
+    }
+
+    public Integer getHouseTypeId() {
+        return houseTypeId;
+    }
+
+    public void setHouseTypeId(Integer houseTypeId) {
+        this.houseTypeId = houseTypeId;
+    }
+
     @Override
     public String toString() {
         return "OrganizationInfo{" +
@@ -249,6 +282,8 @@ public class OrganizationInfo extends BaseEntity
                 ", roomId=" + roomId +
                 ", buildingId=" + buildingId +
                 ", areaId=" + areaId +
+                ", industryType=" + industryType +
+                ", houseTypeId=" + houseTypeId +
                 ", organizationName='" + organizationName + '\'' +
                 ", intro='" + intro + '\'' +
                 ", lngLat='" + lngLat + '\'' +
@@ -262,6 +297,7 @@ public class OrganizationInfo extends BaseEntity
                 ", enterTime=" + enterTime +
                 ", employeNum=" + employeNum +
                 ", audio='" + audio + '\'' +
+                ", floor=" + floor +
                 '}';
     }
 }

src/main/java/com/lqkj/info/entity/PlanInfo.java

@@ -42,6 +42,18 @@ public class PlanInfo extends BaseEntity
     @Excel(name = "面积")
     private Integer acreage;
 
+    /** 成本 */
+    private String cost;
+
+    /** 收益 */
+    private String earnings;
+
+    /** 总占比 */
+    private String totalPct;
+
+    /** 风险*/
+    private String risk;
+
     public void setPlanId(Integer planId) 
     {
         this.planId = planId;
@@ -106,16 +118,52 @@ public class PlanInfo extends BaseEntity
         return acreage;
     }
 
+    public String getCost() {
+        return cost;
+    }
+
+    public void setCost(String cost) {
+        this.cost = cost;
+    }
+
+    public String getEarnings() {
+        return earnings;
+    }
+
+    public void setEarnings(String earnings) {
+        this.earnings = earnings;
+    }
+
+    public String getTotalPct() {
+        return totalPct;
+    }
+
+    public void setTotalPct(String totalPct) {
+        this.totalPct = totalPct;
+    }
+
+    public String getRisk() {
+        return risk;
+    }
+
+    public void setRisk(String risk) {
+        this.risk = risk;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("planId", getPlanId())
-            .append("areaId", getAreaId())
-            .append("typeId", getTypeId())
-            .append("planName", getPlanName())
-            .append("content", getContent())
-            .append("colour", getColour())
-            .append("acreage", getAcreage())
-            .toString();
+        return "PlanInfo{" +
+                "planId=" + planId +
+                ", areaId=" + areaId +
+                ", typeId=" + typeId +
+                ", planName='" + planName + '\'' +
+                ", content='" + content + '\'' +
+                ", colour='" + colour + '\'' +
+                ", acreage=" + acreage +
+                ", cost='" + cost + '\'' +
+                ", earnings='" + earnings + '\'' +
+                ", totalPct='" + totalPct + '\'' +
+                ", risk='" + risk + '\'' +
+                '}';
     }
 }

src/main/java/com/lqkj/info/entity/PolicyInfo.java

@@ -1,9 +1,11 @@
 package com.lqkj.info.entity;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
+
 import com.lqkj.common.annotation.Excel;
 import com.lqkj.common.core.model.BaseEntity;
+import org.springframework.data.annotation.Transient;
+
+
 
 /**
  * 政策信息对象 policy_info
@@ -18,6 +20,9 @@ public class PolicyInfo extends BaseEntity
     /** 政策id */
     private Integer policyId;
 
+    /** 类型id */
+    private Integer typeId;
+
     /** 政策名称 */
     @Excel(name = "政策名称")
     private String policyName;
@@ -29,6 +34,11 @@ public class PolicyInfo extends BaseEntity
     @Excel(name = "文件名")
     private String fileName;
 
+
+    @Transient
+    private String orderBy;
+
+
     public void setPolicyId(Integer policyId) 
     {
         this.policyId = policyId;
@@ -66,14 +76,31 @@ public class PolicyInfo extends BaseEntity
         return fileName;
     }
 
+    public Integer getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
+    public String getOrderBy() {
+        return orderBy;
+    }
+
+    public void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("policyId", getPolicyId())
-            .append("policyName", getPolicyName())
-            .append("url", getUrl())
-            .append("createTime", getCreateTime())
-            .append("fileName", getFileName())
-            .toString();
+        return "PolicyInfo{" +
+                "policyId=" + policyId +
+                ", typeId=" + typeId +
+                ", policyName='" + policyName + '\'' +
+                ", url='" + url + '\'' +
+                ", fileName='" + fileName + '\'' +
+                ", orderBy='" + orderBy + '\'' +
+                '}';
     }
 }

src/main/java/com/lqkj/ioc/controller/EconomicDevelopmentController.java

@@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 
+/**
+ * 城市推荐-经济发展
+ */
 @Api(tags = {"城市推荐-经济发展"})
 @RestController
 @RequestMapping("/ioc/cityRecommendation/economicDevelopment")

src/main/java/com/lqkj/ioc/controller/SecurityPerceptionController.java

@@ -0,0 +1,49 @@
+package com.lqkj.ioc.controller;
+
+
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.ioc.service.SecurityPerceptionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = {"安防感知"})
+@RestController
+@RequestMapping("/ioc/securityPerception")
+public class SecurityPerceptionController {
+
+    @Autowired
+    private SecurityPerceptionService securityPerceptionService;
+
+    @ApiOperation("智慧电梯-电梯基本情况")
+    @GetMapping("/getElevatorBasicInfo")
+    public ResultUtil getElevatorBasicInfo(){
+        return ResultUtil.success(securityPerceptionService.getElevatorBasicInfo());
+    }
+
+    @ApiOperation("智慧电梯-电梯维修统计")
+    @GetMapping("/getElevatorRepairStats")
+    public ResultUtil getElevatorRepairStats(){
+        return ResultUtil.success(securityPerceptionService.getElevatorRepairStats());
+    }
+
+
+    @ApiOperation("智慧电梯-电梯告警分布")
+    @GetMapping("/elevatorAlarmDistribution")
+    public ResultUtil elevatorAlarmDistribution(){
+        return ResultUtil.success(securityPerceptionService.elevatorAlarmDistribution());
+    }
+
+    @ApiOperation("停车场-充电桩使用品牌")
+    @GetMapping("/countChargingStationBrands")
+    public ResultUtil countChargingStationBrands(){
+        return ResultUtil.success(securityPerceptionService.countChargingStationBrands());
+    }
+
+
+
+}

src/main/java/com/lqkj/ioc/controller/SmartParkController.java

@@ -0,0 +1,34 @@
+package com.lqkj.ioc.controller;
+
+
+import com.lqkj.common.core.model.ResultUtil;
+import com.lqkj.ioc.service.SmartParkService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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;
+
+@Api(tags = {"智能园区"})
+@RestController
+@RequestMapping("/ioc/smartPark")
+public class SmartParkController {
+
+    @Autowired
+    private SmartParkService smartParkService;
+
+
+    @ApiOperation("智慧园区-园区新增入驻情况")
+    @GetMapping("/addParkNewTenant")
+    public ResultUtil addParkNewTenant(){
+        return ResultUtil.success(smartParkService.addParkNewTenant());
+    }
+
+
+    @ApiOperation("智慧园区-园区消防")
+    @GetMapping("/getParkFireProtectionInfo")
+    public ResultUtil getParkFireProtectionInfo(){
+        return ResultUtil.success(smartParkService.getParkFireProtectionInfo());
+    }
+}

src/main/java/com/lqkj/ioc/controller/SupportResourcesController.java

@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * 配套资源
+ */
 @Api(tags = {"配套资源"})
 @RestController
 @RequestMapping("/ioc/SupportResources")

src/main/java/com/lqkj/ioc/controller/TrafficSystemController.java

@@ -10,6 +10,9 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+/**
+ * 交通系统
+ */
 @Api(tags = {"交通系统"})
 @RestController
 @RequestMapping("/ioc/trafficSystem")

src/main/java/com/lqkj/ioc/mapper/SecurityPerceptionMapper.java

@@ -0,0 +1,39 @@
+package com.lqkj.ioc.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface SecurityPerceptionMapper {
+
+
+
+    @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
+            "FROM sys_dict_data sdd " +
+            "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.type " +
+            "WHERE sdd.dict_type = 'elevator_type' GROUP BY sdd.dict_label"
+    )
+    List<Map<String, Object>> getElevatorBasicInfo();
+
+    @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
+            "FROM sys_dict_data sdd " +
+            "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.status " +
+            "WHERE sdd.dict_type = 'elevator_info_status' GROUP BY sdd.dict_code")
+    List<Map<String, Object>> getElevatorRepairStats();
+
+    @Select("SELECT sdd.dict_label, COUNT(ei.elevator_id) " +
+            "FROM sys_dict_data sdd " +
+            "LEFT JOIN elevator_info ei ON sdd.dict_value::integer = ei.status " +
+            "WHERE sdd.dict_type = 'elevator_info_status' and sdd.dict_value IN ('3', '7', '8') GROUP BY sdd.dict_code")
+    List<Map<String, Object>> elevatorAlarmDistribution();
+
+    @Select("SELECT sdd.dict_label, COUNT(ei.equipment_id) " +
+            "FROM sys_dict_data sdd " +
+            "LEFT JOIN equipment_info ei ON sdd.dict_value::integer = ei.brand " +
+            "WHERE sdd.dict_type = 'equip_brand' GROUP BY sdd.dict_code")
+    List<Map<String, Object>> countChargingStationBrands();
+}

src/main/java/com/lqkj/ioc/mapper/SmartParkMapper.java

@@ -0,0 +1,50 @@
+package com.lqkj.ioc.mapper;
+
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface SmartParkMapper {
+
+    @Select("WITH months AS ( " +
+            "    SELECT generate_series( " +
+            "        date_trunc('year', CURRENT_DATE) - INTERVAL '1 year',  " +
+            "        date_trunc('month', CURRENT_DATE),  " +
+            "        '1 month' :: INTERVAL " +
+            "    ) AS MONTH " +
+            ") " +
+            "SELECT  " +
+            "    CASE  " +
+            "        WHEN EXTRACT(YEAR FROM M.MONTH) = EXTRACT(YEAR FROM CURRENT_DATE) THEN '今年' " +
+            "        WHEN EXTRACT(YEAR FROM M.MONTH) = EXTRACT(YEAR FROM CURRENT_DATE) - 1 THEN '去年' " +
+            "        ELSE EXTRACT(YEAR FROM M.MONTH)::TEXT " +
+            "    END AS YEAR, " +
+            "    EXTRACT(MONTH FROM M.MONTH) AS MONTH, " +
+            "    COALESCE(COUNT(C.organization_id), 0) AS join_count " +
+            "FROM months M " +
+            "LEFT JOIN organization_info C  " +
+            "    ON EXTRACT(YEAR FROM C.enter_time) = EXTRACT(YEAR FROM M.MONTH) " +
+            "    AND EXTRACT(MONTH FROM C.enter_time) = EXTRACT(MONTH FROM M.MONTH) " +
+            "GROUP BY YEAR, MONTH " +
+            "ORDER BY YEAR DESC, MONTH;")
+    List<Map<String, Object>> addParkNewTenant();
+
+
+    @Select("WITH months AS ( SELECT generate_series(date_trunc('year', CURRENT_DATE), " +
+            "date_trunc('year', CURRENT_DATE) + interval '1 year' - interval '1 month', " +
+            "'1 month'::interval) AS month) " +
+            "SELECT " +
+            "EXTRACT(MONTH FROM m.month) AS month, " +
+            "COALESCE(COUNT(r.forewarning_id), 0) AS total, " +
+            "COALESCE(COUNT(CASE WHEN r.is_resolve = 't' THEN 't' END), 0) AS resolved  " +
+            "FROM months m " +
+            "LEFT JOIN forewarning_info r " +
+            "ON EXTRACT(MONTH FROM r.create_time) = EXTRACT(MONTH FROM m.month) " +
+            "AND EXTRACT(YEAR FROM r.create_time) = EXTRACT(YEAR FROM CURRENT_DATE)  " +
+            "GROUP BY m.month ORDER BY month;")
+    List<Map<String, Object>> getParkFireProtectionInfo();
+}

src/main/java/com/lqkj/ioc/service/SecurityPerceptionService.java

@@ -0,0 +1,36 @@
+package com.lqkj.ioc.service;
+
+
+import com.lqkj.ioc.mapper.SecurityPerceptionMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SecurityPerceptionService {
+
+    @Autowired
+    private SecurityPerceptionMapper securityPerceptionMapper;
+
+
+    public List<Map<String, Object>> getElevatorBasicInfo() {
+
+        return securityPerceptionMapper.getElevatorBasicInfo();
+    }
+
+    public List<Map<String, Object>> getElevatorRepairStats() {
+
+        return securityPerceptionMapper.getElevatorRepairStats();
+    }
+
+    public List<Map<String, Object>> elevatorAlarmDistribution() {
+
+        return securityPerceptionMapper.elevatorAlarmDistribution();
+    }
+
+    public List<Map<String, Object>> countChargingStationBrands() {
+        return securityPerceptionMapper.countChargingStationBrands();
+    }
+}

src/main/java/com/lqkj/ioc/service/SmartParkService.java

@@ -0,0 +1,25 @@
+package com.lqkj.ioc.service;
+
+
+import com.lqkj.ioc.mapper.SmartParkMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SmartParkService {
+
+    @Autowired
+    private SmartParkMapper smartParkMapper;
+
+
+    public List<Map<String,Object>> addParkNewTenant() {
+        return smartParkMapper.addParkNewTenant();
+    }
+
+    public List<Map<String,Object>> getParkFireProtectionInfo() {
+        return smartParkMapper.getParkFireProtectionInfo();
+    }
+}

src/main/java/com/lqkj/system/entity/SysDictData.java

@@ -52,6 +52,9 @@ public class SysDictData extends BaseEntity
     @Excel(name = "状态", readConverterExp = "true=正常,false=停用")
     private Boolean status;
 
+    /** 菜单图标 */
+    private String icon;
+
     public Integer getDictCode()
     {
         return dictCode;
@@ -144,6 +147,14 @@ public class SysDictData extends BaseEntity
         this.status = status;
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
@@ -161,6 +172,7 @@ public class SysDictData extends BaseEntity
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("remark", getRemark())
+                .append("icon", getIcon())
                 .toString();
     }
 }

src/main/java/com/lqkj/type/entity/OrganizationType.java

@@ -46,6 +46,8 @@ public class OrganizationType extends BaseEntity
     @Excel(name = "颜色")
     private String colour;
 
+    private String icon;
+
     public void setTypeId(Integer typeId) 
     {
         this.typeId = typeId;
@@ -128,18 +130,27 @@ public class OrganizationType extends BaseEntity
         return colour;
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("typeId", getTypeId())
-            .append("parentId", getParentId())
-            .append("typeName", getTypeName())
-            .append("click", getClick())
-            .append("search", getSearch())
-            .append("description", getDescription())
-            .append("orderId", getOrderId())
-            .append("memo", getMemo())
-            .append("colour", getColour())
-            .toString();
+        return "OrganizationType{" +
+                "typeId=" + typeId +
+                ", parentId=" + parentId +
+                ", typeName='" + typeName + '\'' +
+                ", click=" + click +
+                ", search=" + search +
+                ", description='" + description + '\'' +
+                ", orderId=" + orderId +
+                ", memo='" + memo + '\'' +
+                ", colour='" + colour + '\'' +
+                ", icon='" + icon + '\'' +
+                '}';
     }
 }

src/main/resources/db/migration/V1_1__init.sql

@@ -293,7 +293,7 @@ SELECT setval('sys_dept_dept_id_seq', 200, true);
 -- ----------------------------
 -- 初始化-部门表数据
 -- ----------------------------
-insert into sys_dept values(100,  0,   '0',          '灵奇空间软件有限公司',   0, '', '', '', true,  'admin', now(), '', null),
+insert into sys_dept values(100,  0,   '0',          'xx公司',   0, '', '', '', true,  'admin', now(), '', null),
                            (101,  100, '0,100',      '研发部', 1, '', '', '', true,  'admin', now(), '', null),
                            (102,  100, '0,100',      '产品部', 2, '', '', '', true,  'admin', now(), '', null),
                            (103,  100, '0,100',      '项目部', 3, '', '', '', true,  'admin', now(), '', null),

src/main/resources/db/migration/V1_2__20230202.sql

@@ -1,4 +1,4 @@
-update sys_config set config_value = '武侯区悦湖新材料产业功能区管理系统' where config_key = 'sys.index.title';
+update sys_config set config_value = '武侯区华西医美健康数字孪生管理系统' where config_key = 'sys.index.title';
 
 delete from cms_category;
 insert into cms_category values(1, 0, null, '新闻资讯', 0, null, 1, '超级管理员', now());

src/main/resources/db/migration/V1_6__20241126_icon.sql

@@ -42,7 +42,9 @@ comment on column room_type.icon is '图标';
 
 
 INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 0, '公交', 't', 't', NULL, 0, NULL, '#0D4D69', NULL);
-INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '地铁', 't', 't', NULL, 1, NULL, '#1B8C2C', null);
+INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '地铁', 't', 't', NULL, 1, NULL, '#1B8C2C', NULL);
+INSERT INTO "public"."traffic_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 0, '高铁', 't', 't', '高铁', 0, '高铁', NULL, NULL);
+
 SELECT setval('traffic_type_type_id_seq', (SELECT MAX(type_id) FROM traffic_type));
 
 

src/main/resources/db/migration/V1_7__20241202.sql

@@ -0,0 +1,74 @@
+ALTER TABLE plan_info ADD COLUMN "cost" VARCHAR(255) NULL;
+comment on column plan_info."cost" is '成本';
+ALTER TABLE plan_info ADD COLUMN "earnings" VARCHAR(255) NULL;
+comment on column plan_info."earnings" is '收益';
+ALTER TABLE plan_info ADD COLUMN "total_pct" VARCHAR(255) NULL;
+comment on column plan_info."total_pct" is '总占比';
+ALTER TABLE plan_info ADD COLUMN "risk" VARCHAR(255) NULL;
+comment on column plan_info."risk" is '风险';
+
+
+ALTER TABLE policy_info ADD COLUMN "file_name" VARCHAR(255) NULL;
+comment on column policy_info."file_name" is '文件名';
+
+ALTER TABLE policy_info ADD COLUMN "type_id" INT4 NULL;
+comment on column policy_info."type_id" is '类型id';
+
+ALTER TABLE organization_info ADD COLUMN "industry_type" INT4 NULL;
+comment on column organization_info."industry_type" is '产业类型';
+
+ALTER TABLE organization_info ADD COLUMN "floor" INT4 NULL;
+comment on column organization_info."floor" is '楼层';
+
+ALTER TABLE elevator_info ADD COLUMN "type" INT4 NULL;
+comment on column elevator_info."type" is '类型';
+
+ALTER TABLE elevator_info ADD COLUMN "run_floors" VARCHAR(255) NULL;
+comment on column elevator_info."run_floors" is '运行楼层';
+
+ALTER TABLE elevator_info ADD COLUMN "run_time" VARCHAR(255) NULL;
+comment on column elevator_info."run_time" is '运行时间';
+
+ALTER TABLE equipment_info ADD COLUMN "device_status" int4 NULL;
+comment on column equipment_info."device_status" is '使用状态';
+
+ALTER TABLE equipment_info ADD COLUMN "equip_code" VARCHAR(255) NULL;
+comment on column equipment_info."equip_code" is '设备编号';
+
+ALTER TABLE equipment_info ADD COLUMN "brand" int4 NULL;
+comment on column equipment_info."brand" is '品牌';
+
+ALTER TABLE organization_info ADD COLUMN "house_type_id" int4 NULL;
+comment on column organization_info."house_type_id" is '户型id';
+
+ALTER TABLE building_info ALTER COLUMN memo TYPE VARCHAR(9999);
+
+
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '监控', 't', 't', NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 1, '电梯监控', 't', 't', NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 1, '停车场监控', 't', 't', NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (4, 0, '充电桩', 't', 't', NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (5, 1, '重点区域监控', 't', 't', NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (6, 1, '重点设备监控', 't', 't', '重点设备监控', 0, '重点设备监控', NULL, NULL);
+INSERT INTO "public"."equipment_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (7, 1, '电力值班室监控', 't', 't', '电力值班室监控', 0, '电力值班室监控', NULL, NULL);
+
+select setval('equipment_type_type_id_seq', (select max(type_id) from equipment_type));
+
+
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (1, 0, '人文休闲', 't', 't', '描述', 1, '备注', NULL, NULL);
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (2, 0, '人文景观', 't', 't', '人文景观', 2, '人文景观', NULL, NULL);
+INSERT INTO "public"."organization_type" ("type_id", "parent_id", "type_name", "click", "search", "description", "order_id", "memo", "colour", "icon") VALUES (3, 0, '历史景点', 't', 't', '历史景点', 0, '历史景点', NULL, NULL);
+select setval('organization_type_type_id_seq', (select max(type_id) from organization_type));
+
+
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (2, 1, NULL, NULL, NULL, '武侯祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/3800608a-92cb-4bd3-b63b-008f1eef5b3f.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (3, 1, NULL, NULL, NULL, '成都锦里', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/53f33589-b044-448b-85b2-9792c25b412b.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (4, 1, NULL, NULL, NULL, '三义祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/e79a0489-fb32-411b-a7bc-4a5d3eb9d587.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (5, 1, NULL, NULL, NULL, '天府广场', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/888c70ea-db04-4bd1-812b-8cfc137e647f.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (6, 3, NULL, NULL, NULL, '武侯祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/fa5663a9-c217-40e1-8ed8-5c117d8dad73.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (7, 3, NULL, NULL, NULL, '成都锦里', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/763ea03f-74c4-480c-ab93-9ff94ee1e495.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (8, 3, NULL, NULL, NULL, '三义祠', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/2fc1e106-99c6-4494-88fc-30bb20e54f60.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+INSERT INTO "public"."organization_info" ("organization_id", "type_id", "room_id", "building_id", "area_id", "organization_name", "intro", "lng_lat", "raster_lng_lat", "important", "type_name", "address", "logo", "telephone", "product", "enter_time", "employe_num", "audio", "industry_type", "floor") VALUES (9, 3, NULL, NULL, NULL, '天府广场', NULL, NULL, NULL, 't', NULL, NULL, '/profile/upload/2024/12/03/7e596486-b5c4-4c85-890a-6aa6f12840f8.png', NULL, NULL, NULL, 0, NULL, NULL, NULL);
+select setval('organization_info_organization_id_seq', (select max(organization_id) from organization_info));
+
+

src/main/resources/mapper/info/ElevatorInfoMapper.xml

@@ -11,10 +11,13 @@
 		<result property="status"    column="status"    />
 		<result property="elevatorName"    column="elevator_name"    />
 		<result property="upkeepNum"    column="upkeep_num"    />
+		<result property="type" column="type"/>
+		<result property="runFloor"    column="run_floors"    />
+		<result property="runTime"    column="run_time"    />
 	</resultMap>
 
 	<sql id="selectElevatorInfoVo">
-		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num from elevator_info
+		select elevator_id, elevator_code, building_id, status, elevator_name, upkeep_num, type, run_floors, run_time from elevator_info
 	</sql>
 
 	<select id="selectElevatorInfoList" parameterType="ElevatorInfo" resultMap="ElevatorInfoResult">
@@ -24,6 +27,9 @@
 			<if test="buildingId != null "> and building_id = #{buildingId}</if>
 			<if test="status != null "> and status = #{status}</if>
 			<if test="elevatorName != null  and elevatorName != ''"> and elevator_name like concat('%', #{elevatorName}, '%')</if>
+			<if test="type != null "> and type = #{type}</if>
+			<if test="runFloor != null and runFloor != ''"> and run_floors like concat('%', #{runFloor}, '%')</if>
+			<if test="runTime != null and runTime != ''"> and run_time like concat('%', #{runTime}, '%')</if>
 		</where>
 		order by elevator_id
 
@@ -42,6 +48,9 @@
 			<if test="status != null">status,</if>
 			<if test="elevatorName != null and elevatorName != ''">elevator_name,</if>
 			<if test="upkeepNum != null">upkeep_num,</if>
+		    <if test="type != null">type,</if>
+		    <if test="runFloor != null and runFloor != ''">run_floors,</if>
+		    <if test="runTime != null and runTime != ''">run_time,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="elevatorCode != null and elevatorCode != ''">#{elevatorCode},</if>
@@ -49,6 +58,9 @@
 			<if test="status != null">#{status},</if>
 			<if test="elevatorName != null and elevatorName != ''">#{elevatorName},</if>
 			<if test="upkeepNum != null">#{upkeepNum},</if>
+		    <if test="type != null">#{type},</if>
+		    <if test="runFloor != null and runFloor != ''">#{runFloor},</if>
+		    <if test="runTime != null and runTime != ''">#{runTime},</if>
 		</trim>
 	</insert>
 
@@ -60,6 +72,9 @@
 			status = #{status},
 			elevator_name = #{elevatorName},
 			upkeep_num = #{upkeepNum},
+		    type = #{type},
+			run_floors = #{runFloor},
+		    run_time = #{runTime},
 		</trim>
 		where elevator_id = #{elevatorId}
 	</update>

src/main/resources/mapper/info/EquipmentInfoMapper.xml

@@ -15,19 +15,24 @@
 		<result property="rasterLngLat"    column="raster_lng_lat"    />
 		<result property="typeName"    column="type_name"    />
 		<result property="status"    column="status"    />
+		<result property="equipCode"    column="equip_code"    />
+		<result property="deviceStatus"    column="device_status"    />
+		<result property="brand" column="brand"/>
 	</resultMap>
 
 	<sql id="selectEquipmentInfoVo">
-		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status from equipment_info
+		select equipment_id, type_id, room_id, building_id, area_id, equipment_name, lng_lat, raster_lng_lat, type_name, status, equip_code, device_status, brand from equipment_info
 	</sql>
 
 	<select id="selectEquipmentInfoList" parameterType="EquipmentInfo" resultMap="EquipmentInfoResult">
 		<include refid="selectEquipmentInfoVo"/>
 		<where>
 			<if test="equipmentName != null  and equipmentName != ''"> and equipment_name like concat('%', #{equipmentName}, '%')</if>
-			<if test="lngLat != null  and lngLat != ''"> and lng_lat like concat('%', #{lngLat}, '%')</if>
-			<if test="rasterLngLat != null  and rasterLngLat != ''"> and raster_lng_lat like concat('%', #{rasterLngLat}, '%')</if>
-			<if test="typeName != null  and typeName != ''"> and type_name = #{typeName}</if>
+			<if test="typeId != null"> and type_id = #{typeId}</if>
+			<if test="buildingId != null"> and building_id = #{buildingId}</if>
+			<if test="areaId != null"> and area_id = #{areaId}</if>
+			<if test="roomId != null"> and room_id = #{roomId}</if>
+			<if test="status != null"> and status = #{status}</if>
 		</where>
 		order by equipment_id
 
@@ -50,6 +55,9 @@
 			<if test="rasterLngLat != null and rasterLngLat != ''">raster_lng_lat,</if>
 			<if test="typeName != null and typeName != ''">type_name,</if>
 			<if test="status != null">status,</if>
+		    <if test="equipCode != null and equipCode != ''">equip_code,</if>
+		    <if test="deviceStatus != null">device_status,</if>
+		    <if test="brand != null">brand,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -61,6 +69,9 @@
 			<if test="rasterLngLat != null and rasterLngLat != ''">#{rasterLngLat},</if>
 			<if test="typeName != null and typeName != ''">#{typeName},</if>
 			<if test="status != null">#{status},</if>
+		    <if test="equipCode != null and equipCode != ''">#{equipCode},</if>
+		    <if test="deviceStatus != null">#{deviceStatus},</if>
+		    <if test="brand != null">#{brand},</if>
 		</trim>
 	</insert>
 
@@ -76,6 +87,9 @@
 			raster_lng_lat = #{rasterLngLat},
 			type_name = #{typeName},
 			status = #{status},
+		    equip_code = #{equipCode},
+		    device_status = #{deviceStatus},
+		    brand = #{brand},
 		</trim>
 		where equipment_id = #{equipmentId}
 	</update>

src/main/resources/mapper/info/OrganizationInfoMapper.xml

@@ -23,10 +23,13 @@
 		<result property="enterTime"    column="enter_time"    />
 		<result property="employeNum"    column="employe_num"    />
 		<result property="audio"    column="audio"    />
+		<result property="industryType" column="industry_type"/>
+		<result property="floor" column="floor"/>
+		<result property="houseTypeId" column="house_type_id"/>
 	</resultMap>
 
 	<sql id="selectOrganizationInfoVo">
-		select organization_id, type_id, room_id, building_id, area_id, organization_name, intro, lng_lat, raster_lng_lat, important, type_name, address, logo, telephone, product, enter_time, employe_num, audio from organization_info
+		select organization_id, type_id, room_id, building_id, area_id, organization_name, intro, lng_lat, raster_lng_lat, important, type_name, address, logo, telephone, product, enter_time, employe_num, audio, industry_type, floor, house_type_id from organization_info
 	</sql>
 
 	<select id="selectOrganizationInfoList" parameterType="OrganizationInfo" resultMap="OrganizationInfoResult">
@@ -38,6 +41,9 @@
 			<if test="areaId != null "> and area_id = #{areaId}</if>
 			<if test="organizationName != null  and organizationName != ''"> and organization_name like concat('%', #{organizationName}, '%')</if>
 			<if test="important != null "> and important = #{important}</if>
+			<if test="industryType != null "> and industry_type = #{industryType}</if>
+			<if test="floor != null "> and floor = #{floor}</if>
+			<if test="houseTypeId != null "> and house_type_id = #{houseTypeId}</if>
 		</where>
 		order by organization_id
 
@@ -68,6 +74,9 @@
 			<if test="enterTime != null">enter_time,</if>
 			<if test="employeNum != null">employe_num,</if>
 		    <if test="audio != null and audio != ''">logo,</if>
+		    <if test="industryType != null">industry_type,</if>
+		    <if test="floor != null">floor,</if>
+		    <if test="houseTypeId != null">house_type_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="typeId != null">#{typeId},</if>
@@ -87,6 +96,9 @@
 			<if test="enterTime != null">#{enterTime},</if>
 			<if test="employeNum != null">#{employeNum},</if>
 		    <if test="audio != null and audio != ''">#{logo},</if>
+		    <if test="industryType != null">#{industryType},</if>
+		    <if test="floor != null">#{floor},</if>
+		    <if test="houseTypeId != null">#{houseTypeId},</if>
 		</trim>
 	</insert>
 
@@ -110,6 +122,9 @@
 			enter_time = #{enterTime},
 			employe_num = #{employeNum},
 		    audio = #{audio},
+		    industry_type = #{industryType},
+		    floor = #{floor},
+		    house_type_id = #{houseTypeId}
 		</trim>
 		where organization_id = #{organizationId}
 	</update>

src/main/resources/mapper/info/PlanInfoMapper.xml

@@ -12,10 +12,14 @@
 		<result property="content"    column="content"    />
 		<result property="colour"    column="colour"    />
 		<result property="acreage"    column="acreage"    />
+		<result property="cost" column="cost"/>
+		<result property="totalPct" column="total_pct"/>
+		<result property="risk" column="risk"/>
+		<result property="earnings" column="earnings"/>
 	</resultMap>
 
 	<sql id="selectPlanInfoVo">
-		select plan_id, area_id, type_id, plan_name, content, colour, acreage from plan_info
+		select plan_id, area_id, type_id, plan_name, content, colour, acreage, cost, total_pct, risk, earnings from plan_info
 	</sql>
 
 	<select id="selectPlanInfoList" parameterType="PlanInfo" resultMap="PlanInfoResult">
@@ -43,6 +47,10 @@
 			<if test="content != null and content != ''">content,</if>
 			<if test="colour != null and colour != ''">colour,</if>
 			<if test="acreage != null">acreage,</if>
+		    <if test="cost != null and cost != ''">cost,</if>
+		    <if test="totalPct != null and totalPct != ''">total_pct,</if>
+		    <if test="risk != null and risk != ''">risk,</if>
+		    <if test="earnings != null and earnings != ''">earnings,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="areaId != null">#{areaId},</if>
@@ -51,6 +59,10 @@
 			<if test="content != null and content != ''">#{content},</if>
 			<if test="colour != null and colour != ''">#{colour},</if>
 			<if test="acreage != null">#{acreage},</if>
+		    <if test="cost != null and cost != ''">#{cost},</if>
+		    <if test="totalPct != null and totalPct != ''">#{totalPct},</if>
+		    <if test="risk != null and risk != ''">#{risk},</if>
+		    <if test="earnings != null and earnings != ''">#{earnings},</if>
 		</trim>
 	</insert>
 
@@ -63,6 +75,10 @@
 			content = #{content},
 			colour = #{colour},
 			acreage = #{acreage},
+		    cost = #{cost},
+		    total_pct = #{totalPct},
+		    risk = #{risk},
+		    earnings = #{earnings},
 		</trim>
 		where plan_id = #{planId}
 	</update>

src/main/resources/mapper/info/PolicyInfoMapper.xml

@@ -10,10 +10,11 @@
 		<result property="url"    column="url"    />
 		<result property="createTime"    column="create_time"    />
 		<result property="fileName"    column="file_name"    />
+		<result property="typeId"    column="type_id"    />
 	</resultMap>
 
 	<sql id="selectPolicyInfoVo">
-		select policy_id, policy_name, url, create_time, file_name from policy_info
+		select policy_id, policy_name, url, create_time, file_name, type_id from policy_info
 	</sql>
 
 	<select id="selectPolicyInfoList" parameterType="PolicyInfo" resultMap="PolicyInfoResult">
@@ -22,8 +23,16 @@
 			<if test="policyName != null  and policyName != ''"> and policy_name like concat('%', #{policyName}, '%')</if>
 			<if test="createTime != null "> and create_time = #{createTime}</if>
 			<if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
+			<if test="typeId != null "> and type_id = #{typeId}</if>
 		</where>
-		order by policy_id
+		<choose>
+			<when test="orderBy != null and orderBy != ''">
+				order by create_time desc
+			</when>
+			<otherwise>
+				order by create_time
+			</otherwise>
+		</choose>
 
 	</select>
 
@@ -39,12 +48,14 @@
 			<if test="url != null and url != ''">url,</if>
 			<if test="createTime != null">create_time,</if>
 			<if test="fileName != null and fileName != ''">file_name,</if>
+		    <if test="typeId != null">type_id,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="policyName != null and policyName != ''">#{policyName},</if>
 			<if test="url != null and url != ''">#{url},</if>
 			now(),
 			<if test="fileName != null and fileName != ''">#{fileName},</if>
+		    <if test="typeId != null">#{typeId},</if>
 		</trim>
 	</insert>
 
@@ -54,6 +65,7 @@
 			policy_name = #{policyName},
 			url = #{url},
 			file_name = #{fileName},
+		    type_id = #{typeId},
 		</trim>
 		where policy_id = #{policyId}
 	</update>

src/main/resources/mapper/system/SysDictDataMapper.xml

@@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="createTime" column="create_time" />
 		<result property="updateBy"   column="update_by"   />
 		<result property="updateTime" column="update_time" />
+		<result property="icon"		  column="icon"        />
 	</resultMap>
 	
 	<sql id="selectDictDataVo">
-        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark 
+        select dict_code, dict_sort, dict_label, dict_value, dict_type, css_class, list_class, is_default, status, create_by, create_time, remark, icon
 		from sys_dict_data
     </sql>
 
@@ -84,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status = #{status},</if>
  			<if test="remark != null">remark = #{remark},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
+ 		    <if test="icon != null and icon != ''">icon = #{icon},</if>
  			update_time = now()
  		</set>
  		where dict_code = #{dictCode}
@@ -105,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">status,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+ 		    <if test="icon != null and icon != ''">icon,</if>
  			create_time
  		)values(
  		    <if test="dictSort != null">#{dictSort},</if>
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="status != null">#{status},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+ 		    <if test="icon != null and icon != ''">#{icon},</if>
 		now()
  		)
 	</insert>

src/main/resources/mapper/type/OrganizationTypeMapper.xml

@@ -14,10 +14,11 @@
 		<result property="orderId"    column="order_id"    />
 		<result property="memo"    column="memo"    />
 		<result property="colour"    column="colour"    />
+		<result property="icon"    column="icon"    />
 	</resultMap>
 
 	<sql id="selectOrganizationTypeVo">
-		select type_id, parent_id, type_name, click, search, description, order_id, memo, colour from organization_type
+		select type_id, parent_id, type_name, click, search, description, order_id, memo, colour, icon from organization_type
 	</sql>
 
 	<select id="selectOrganizationTypeList" parameterType="OrganizationType" resultMap="OrganizationTypeResult">
@@ -45,6 +46,7 @@
 			<if test="orderId != null">order_id,</if>
 			<if test="memo != null and memo != ''">memo,</if>
 			<if test="colour != null and colour != ''">colour,</if>
+		    <if test="icon != null and icon != ''">icon,</if>
 		</trim>
 		<trim prefix="values (" suffix=")" suffixOverrides=",">
 			<if test="parentId != null">#{parentId},</if>
@@ -55,6 +57,7 @@
 			<if test="orderId != null">#{orderId},</if>
 			<if test="memo != null and memo != ''">#{memo},</if>
 			<if test="colour != null and colour != ''">#{colour},</if>
+		    <if test="icon != null and icon != ''">#{icon},</if>
 		</trim>
 	</insert>
 
@@ -69,6 +72,7 @@
 			order_id = #{orderId},
 			memo = #{memo},
 			colour = #{colour},
+		    icon = #{icon},
 		</trim>
 		where type_id = #{typeId}
 	</update>