Merge branch 'han' of uskycloud/usky-modules into master

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_street_micro_station");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        strategy.setInclude("base_ggp_facility");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
         mpg.setStrategy(strategy);
 
         // 关闭默认 xml 生成，调整生成 至 根目录

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

@@ -0,0 +1,42 @@
+package com.usky.fire.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.fire.domain.BaseGgpFacility;
+import com.usky.fire.service.BaseGgpFacilityService;
+import com.usky.fire.service.vo.BaseGgpFacilityListVO;
+import com.usky.fire.service.vo.BaseGgpFacilityVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 地理信息 前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-10
+ */
+@RestController
+@RequestMapping("/baseGgpFacility")
+public class BaseGgpFacilityController {
+    @Autowired
+    private BaseGgpFacilityService baseGgpFacilityService;
+    /**
+     * 地理信息-撒点
+     *
+     * @param baseGgpFacilityVO
+     * @return
+     */
+    @PostMapping("baseGgpFacilityList")
+    public ApiResult<List<BaseGgpFacility>> baseGgpFacilityList(@RequestBody BaseGgpFacilityVO baseGgpFacilityVO) {
+        return ApiResult.success(baseGgpFacilityService.baseGgpFacilityList(baseGgpFacilityVO));
+    }
+}
+

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

@@ -0,0 +1,166 @@
+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 han
+ * @since 2023-04-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseGgpFacility implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设施编号
+     */
+    private String facilityNum;
+
+    /**
+     * 设施名称
+     */
+    private String facilityName;
+
+    /**
+     * 设施状态
+     */
+    private Integer status;
+
+    /**
+     * 设施地址
+     */
+    private String address;
+
+    /**
+     * 设施类型(1、天然水源 2、建筑)
+     */
+    private Integer facilityType;
+
+    /**
+     * 经度(当设施类型为点时使用该字段)
+     */
+    private String longitude;
+
+    /**
+     * 纬度(当设施类型为点时使用该字段)
+     */
+    private String latitude;
+
+    /**
+     * 经纬度集合(由多个GPS点组成的多边形，当设施类型为线和面时使用该字段)
+     */
+    private String gpsAreas;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区（县）
+     */
+    private String area;
+
+    /**
+     * 所属街镇
+     */
+    private String streetTown;
+
+    /**
+     * 联系人
+     */
+    private String contact;
+
+    /**
+     * 联系方式
+     */
+    private String contactPhone;
+
+    /**
+     * 审核状态
+     */
+    private Integer checkStatus;
+
+    /**
+     * 审核人编号
+     */
+    private Integer checkId;
+
+    /**
+     * 审核人姓名
+     */
+    private String checkName;
+
+    /**
+     * 审核批复
+     */
+    private String checkComment;
+
+    /**
+     * 扩展属性(json格式存储每个设施独有的属性)
+     */
+    private String extendData;
+
+    /**
+     * 图⽚地址URL
+     */
+    private String imagesUrl;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 单位ID
+     */
+    private Integer companyId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 更新人
+     */
+    private String updatePerson;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+
+}

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

@@ -0,0 +1,16 @@
+package com.usky.fire.mapper;
+
+import com.usky.fire.domain.BaseGgpFacility;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 地理信息 Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-10
+ */
+public interface BaseGgpFacilityMapper extends CrudMapper<BaseGgpFacility> {
+
+}

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

@@ -0,0 +1,28 @@
+package com.usky.fire.service;
+
+import com.usky.fire.domain.BaseGgpFacility;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.fire.domain.DemFireStation;
+import com.usky.fire.service.vo.BaseGgpFacilityListVO;
+import com.usky.fire.service.vo.BaseGgpFacilityVO;
+import com.usky.fire.service.vo.DemFireStationVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 地理信息 服务类
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-10
+ */
+public interface BaseGgpFacilityService extends CrudService<BaseGgpFacility> {
+    /**
+     * 地理信息-撒点
+     *
+     * @param baseGgpFacilityVO  主键ID
+     * @return
+     */
+    List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO);
+}

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

@@ -124,7 +124,8 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
             if (CollectionUtils.isNotEmpty(companyIdList)) {
                 LambdaQueryWrapper<BaseCompanyPerson> queryWrapper1 = Wrappers.lambdaQuery();
                 queryWrapper1.select(BaseCompanyPerson::getId, BaseCompanyPerson::getCompanyId, BaseCompanyPerson::getFireDutyName,
-                        BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getDelegateName)
+                        BaseCompanyPerson::getFireManageName, BaseCompanyPerson::getFireManagePhone,
+                        BaseCompanyPerson::getDelegateName)
                         .in(BaseCompanyPerson::getCompanyId, companyIdList);
                 list1 = baseCompanyPersonService.list(queryWrapper1);
                 LambdaQueryWrapper<BaseCompanyAttach1> queryWrapper2 = Wrappers.lambdaQuery();
@@ -165,6 +166,7 @@ public class BaseCompanyServiceImpl extends AbstractCrudService<BaseCompanyMappe
                         map.put("id1", list1.get(j).getId());
                         map.put("fireDutyName", list1.get(j).getFireDutyName());
                         map.put("fireManageName", list1.get(j).getFireManageName());
+                        map.put("fireManagePhone", list1.get(j).getFireManagePhone());
                         map.put("delegateName", list1.get(j).getDelegateName());
                     }
                 }

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

@@ -0,0 +1,52 @@
+package com.usky.fire.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.fire.domain.BaseGgpFacility;
+import com.usky.fire.mapper.BaseGgpFacilityMapper;
+import com.usky.fire.service.BaseGgpFacilityService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import com.usky.fire.service.vo.BaseGgpFacilityListVO;
+import com.usky.fire.service.vo.BaseGgpFacilityVO;
+import com.usky.fire.service.vo.CompanyDataVo;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 地理信息 服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-10
+ */
+@Service
+public class BaseGgpFacilityServiceImpl extends AbstractCrudService<BaseGgpFacilityMapper, BaseGgpFacility> implements BaseGgpFacilityService {
+    @Override
+    public List<BaseGgpFacility> baseGgpFacilityList(BaseGgpFacilityVO baseGgpFacilityVO) {
+        List<BaseGgpFacilityListVO> list1 = new ArrayList<>();
+        LambdaQueryWrapper<BaseGgpFacility> query = Wrappers.lambdaQuery();
+        query.eq(StringUtils.isNotBlank(baseGgpFacilityVO.getStreetTown()),BaseGgpFacility::getStreetTown, baseGgpFacilityVO.getStreetTown());
+        query.in(CollectionUtils.isNotEmpty(baseGgpFacilityVO.getFacilityType()),BaseGgpFacility::getFacilityType,
+                baseGgpFacilityVO.getFacilityType());
+
+        List<BaseGgpFacility> list = this.list(query);
+//        if (CollectionUtils.isNotEmpty(list)) {
+//            for (int j = 0; j < list.size(); j++) {
+//                BaseGgpFacilityListVO baseGgpFacilityListVO = new BaseGgpFacilityListVO();
+//                Object data = null;
+//                data = list.get(j).getExtendData();
+//                JSONObject jsonObject = JSONObject.parseObject(data.toString());
+//                baseGgpFacilityListVO.setBaseGgpFacility(list.get(j));
+//                baseGgpFacilityListVO.setExtendData(jsonObject);
+//                list1.add(baseGgpFacilityListVO);
+//            }
+//        }
+        return list;
+    }
+}

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

@@ -96,7 +96,7 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
         queryWrapper.eq(PatrolInspectionPlanSchedule::getPersonnelId, id);
         List<PatrolInspectionPlanSchedule> listOne = planScheduleService.list(queryWrapper);
         if (listOne.size() > 0) {
-            throw new BusinessException("人员使用中重复不可删除");
+            throw new BusinessException("人员使用中不可删除");
         }
         this.removeById(id);
     }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityListVO.java

@@ -0,0 +1,24 @@
+package com.usky.fire.service.vo;
+
+import com.alibaba.fastjson.JSONObject;
+import com.usky.fire.domain.*;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-02-22
+ */
+@Data
+public class BaseGgpFacilityListVO {
+
+        private BaseGgpFacility baseGgpFacility;
+
+        private JSONObject extendData;
+
+}

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/vo/BaseGgpFacilityVO.java

@@ -0,0 +1,28 @@
+package com.usky.fire.service.vo;
+
+import com.usky.fire.domain.BaseBuild;
+import com.usky.fire.domain.BaseCompany;
+import com.usky.fire.domain.BaseCompanyAttach1;
+import com.usky.fire.domain.BaseCompanyPerson;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author han
+ * @since 2023-04-06
+ */
+@Data
+public class BaseGgpFacilityVO {
+
+        private Integer id;
+
+        private String streetTown;
+
+        private List<Integer> facilityType;
+
+}

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

@@ -0,0 +1,37 @@
+<?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.BaseGgpFacilityMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.fire.domain.BaseGgpFacility">
+        <id column="id" property="id" />
+        <result column="facility_num" property="facilityNum" />
+        <result column="facility_name" property="facilityName" />
+        <result column="status" property="status" />
+        <result column="address" property="address" />
+        <result column="facility_type" property="facilityType" />
+        <result column="longitude" property="longitude" />
+        <result column="latitude" property="latitude" />
+        <result column="gps_areas" property="gpsAreas" />
+        <result column="province" property="province" />
+        <result column="city" property="city" />
+        <result column="area" property="area" />
+        <result column="street_town" property="streetTown" />
+        <result column="contact" property="contact" />
+        <result column="contact_phone" property="contactPhone" />
+        <result column="check_status" property="checkStatus" />
+        <result column="check_id" property="checkId" />
+        <result column="check_name" property="checkName" />
+        <result column="check_comment" property="checkComment" />
+        <result column="extend_data" property="extendData" />
+        <result column="images_url" property="imagesUrl" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+        <result column="company_id" property="companyId" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="update_person" property="updatePerson" />
+        <result column="creator" property="creator" />
+    </resultMap>
+
+</mapper>