Merge branch 'develop_dl_plan6_temp' of…

amos-biz-boot.iml

@@ -100,12 +100,6 @@
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.3.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.3.11.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:2.3.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.11.RELEASE" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.13.3" level="project" />
-    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: jakarta.annotation:jakarta.annotation-api:1.3.5" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-core:5.2.15.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-jcl:5.2.15.RELEASE" level="project" />
@@ -144,6 +138,12 @@
     <orderEntry type="library" name="Maven: com.esotericsoftware.reflectasm:reflectasm:1.09" level="project" />
     <orderEntry type="library" name="Maven: com.github.axet:kaptcha:0.0.9" level="project" />
     <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-logging:2.3.11.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.13.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.30" level="project" />
     <orderEntry type="library" name="Maven: com.yeejoin:amos-component-feign:1.7.8" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-starter-openfeign:2.2.5.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.cloud:spring-cloud-openfeign-core:2.2.5.RELEASE" level="project" />
@@ -220,7 +220,7 @@
     <orderEntry type="library" name="Maven: io.springfox:springfox-bean-validators:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: io.springfox:springfox-spring-webmvc:2.10.5" level="project" />
     <orderEntry type="library" name="Maven: com.github.xiaoymin:knife4j-spring-ui:2.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.yeejoin:amos-feign-systemctl:1.6.5" level="project" />
+    <orderEntry type="library" name="Maven: com.yeejoin:amos-feign-systemctl:1.7.8" level="project" />
     <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.13" level="project" />
   </component>
 </module>
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -5,7 +5,6 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
@@ -13,10 +12,11 @@ import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointItemDao;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemNewVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -52,9 +52,6 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.business.util.FileHelper;
 import com.yeejoin.amos.patrol.business.util.PointParamUtils;
-import com.yeejoin.amos.patrol.business.vo.PointClassifyVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
@@ -400,7 +397,11 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse queryPointByIdNew(@ApiParam(value = "巡检点id", required = true) @RequestParam String id) {
 		try {
 			Point point = iPointService.queryPointById(Long.valueOf(id));
-			return CommonResponseUtil.success(point);
+			PointNewVo pointNewVo = new PointNewVo();
+			BeanUtils.copyProperties(point,pointNewVo);
+			pointNewVo.setIsIndoor(point.getIsIndoor() == false ? "0":"1");
+			pointNewVo.setOffline(point.getOffline() == false ? "0":"1");
+			return CommonResponseUtil.success(pointNewVo);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检点失败");
@@ -1340,12 +1341,18 @@ public class PointController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "新增巡检点", notes = "新增巡检点")
 	@PostMapping(value = "/addPointNew", produces = "application/json;charset=UTF-8")
-	public CommonResponse AddPointNew(@ApiParam(value = "巡检点", required = true) @RequestBody Point point){
+	public CommonResponse AddPointNew(@ApiParam(value = "巡检点", required = true) @RequestBody PointNewVo pointNewVo){
 		AgencyUserModel user = getUserInfo();
 		if (ObjectUtils.isEmpty(user)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
 		try {
+			Point point = new Point();
+			BeanUtils.copyProperties(pointNewVo,point);
+
+			point.setIsIndoor(pointNewVo.getIsIndoor().equals("1") ? true : false);
+			point.setOffline(pointNewVo.getOffline().equals("1") ? true : false);
+
 			ReginParams reginParams = getSelectedOrgInfo();
 			String loginOrgCode = getOrgCode(reginParams);
 			point.setOrgCode(loginOrgCode);	//点归属于公司

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/vo/PointNewVo.java

+package com.yeejoin.amos.patrol.business.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+
+import javax.persistence.Column;
+import javax.persistence.Lob;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import java.util.Date;
+
+public class PointNewVo {
+    private static final long serialVersionUID = 1L;
+
+    public String getChargePersonName() {
+        return chargePersonName;
+    }
+
+    public void setChargePersonName(String chargePersonName) {
+        this.chargePersonName = chargePersonName;
+    }
+
+    /**
+     * 参考地址
+     */
+    @Excel(name = "参考地址", orderNum = "5")
+    private String address;
+
+    /**
+     * 分类编号
+     */
+    @Column(name="catalog_id")
+    private long catalogId;
+
+    /**
+     * 3维坐标(x,y,z)
+     */
+    private String coordinates;
+
+    /**
+     * 创建用户id
+     */
+    @Column(name="creator_id")
+    private String creatorId;
+
+    /**
+     * 有效巡检距离
+     */
+//	@Excel(name = "有效巡检距离", orderNum = "7")
+    private int distance;
+
+    /**
+     * 扩展字段
+     */
+//	@Excel(name = "扩展属性", orderNum = "16")
+    @Lob
+    @Column(name="extend_json")
+    private String extendJson;
+
+    /**
+     * 定点拍照数
+     */
+    @Column(name="fixed_shot")
+    private int fixedShot;
+
+    /**
+     * 是否为固定点(1:固定点，0：移动点)
+     */
+    @Excel(name = "是否为移动点", replace={"是_0", "否_1"}, orderNum = "2")
+    @Column(name="is_fixed")
+    private String isFixed = "1";
+
+    /**
+     * 无计划巡检是否评分(is_score = 1评分,0不评分)
+     */
+    @Excel(name = "计划外巡检是否评分", replace={"是_0", "否_1"}, orderNum = "3")
+    @Column(name="is_score")
+    private String isScore = "0";
+
+    /**
+     * 最新更新时间
+     */
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name="last_update_time")
+    private Date lastUpdateTime;
+
+    /**
+     * 经度
+     */
+    private String latitude;
+
+    /**
+     * 风险等级(1:一级，2：二级，3：三级，4：四级，5：五级)
+     */
+    private String level;
+
+    /**
+     * 纬度
+     */
+    private String longitude;
+
+    /**
+     * 点名称
+     */
+    @Excel(name = "点名称", orderNum = "0")
+    private String name;
+
+    /**
+     * 是否允许离线巡检
+     */
+    @Excel(name = "是否允许离线巡检", replace={"是_1", "否_0"}, orderNum = "4")
+    private String offline;
+
+    /**
+     * 权限系统org code
+     */
+    @Column(name="org_code")
+    private String orgCode;
+
+    /**
+     * 点编号
+     */
+    @Excel(name = "点编号", orderNum = "1")
+    @Column(name="point_no")
+    private String pointNo;
+
+    /**
+     * 备注说明
+     */
+    @Excel(name = "备注说明", orderNum = "11")
+    private String remark;
+
+    /**
+     * 路线id
+     */
+    @Column(name="route_id")
+    private String routeId;
+
+    /**
+     * 路线名称
+     */
+    @Column(name="route_name")
+    private String routeName;
+
+    /**
+     * 是否保存地理信(1:记录，0：不记录)
+     */
+    @Column(name="save_gps")
+    private String saveGps = "0";
+
+    /**
+     * 最大拍照数
+     */
+    @Excel(name = "最多拍照数量", orderNum = "9")
+    @Column(name="shot_max_number")
+    private int shotMaxNumber;
+
+    /**
+     * 最小拍照数
+     */
+    @Excel(name = "最少拍照数量", orderNum = "8")
+    @Column(name="shot_min_number")
+    private int shotMinNumber;
+
+    /**
+     * 是否允许普通拍照(1：允许，0：不允许)
+     */
+    @Column(name="usually_shot")
+    private String usuallyShot = "1";
+
+    /**
+     * 是否删除：0表示未删除，1表示已删除
+     */
+    @Column(name="is_delete")
+    private boolean isDelete;
+
+    /**
+     * 归属区域/部门id
+     */
+    @Column(name="charge_dept_id")
+    private String chargeDeptId ;
+
+    /**
+     * 负责人id
+     */
+    @Column(name="charge_person_id")
+    private String chargePersonId ;
+
+    /**
+     * 负责人id
+     */
+    @Column(name="charge_person_name")
+    private String chargePersonName ;
+
+
+    /**
+     * 状态：0 未纳入巡检，1 合格；2 不合格；3 漏检
+     */
+    @Column(name="status")
+    private String status="0";
+
+    /**
+     * 3维模型楼层
+     */
+    private Integer floor = 1;
+
+    /**
+     * 是否室内
+     */
+    @Excel(name = "是否室内", replace={"是_1", "否_0"}, orderNum = "14")
+    @Column(name="is_indoor")
+    private String isIndoor;
+
+    /**
+     * 原始字段
+     */
+    @Column(name = "original_id", columnDefinition = "varchar(50) COMMENT '原始字段'")
+    private String originalId;
+
+    /**
+     * 风险源id
+     */
+    @Column(name="risk_source_id")
+    private String riskSourceId;
+
+    /**
+     * ue4位置
+     */
+
+    private String ue4Location;
+
+    /**
+     * ue4旋转
+     */
+
+    private String ue4Rotation;
+
+    public String getBizOrgCode() {
+        return bizOrgCode;
+    }
+
+    public void setBizOrgCode(String bizOrgCode) {
+        this.bizOrgCode = bizOrgCode;
+    }
+
+    public String getBizOrgName() {
+        return bizOrgName;
+    }
+
+    public void setBizOrgName(String bizOrgName) {
+        this.bizOrgName = bizOrgName;
+    }
+
+    private String bizOrgCode;
+
+    private String bizOrgName;
+
+    /**
+     * 物理区域id（数据来源于装备wl_area）
+     */
+    private Long areaId;
+    /**
+     * 物理区域名称（数据来源于装备wl_area）
+     */
+    private String areaName;
+
+    public Long getAreaId() {
+        return areaId;
+    }
+
+    public void setAreaId(Long areaId) {
+        this.areaId = areaId;
+    }
+
+    public String getAreaName() {
+        return areaName;
+    }
+
+    public void setAreaName(String areaName) {
+        this.areaName = areaName;
+    }
+
+    public String getRiskSourceId() {
+        return riskSourceId;
+    }
+
+    public void setRiskSourceId(String riskSourceId) {
+        this.riskSourceId = riskSourceId;
+    }
+
+    public String getIsIndoor() {
+        return isIndoor;
+    }
+
+    public void setIsIndoor(String isIndoor) {
+        this.isIndoor = isIndoor;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public PointNewVo() {
+    }
+
+    public String getAddress() {
+        return this.address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public long getCatalogId() {
+        return this.catalogId;
+    }
+
+    public void setCatalogId(long catalogId) {
+        this.catalogId = catalogId;
+    }
+
+    public String getCoordinates() {
+        return this.coordinates;
+    }
+
+    public void setCoordinates(String coordinates) {
+        this.coordinates = coordinates;
+    }
+
+    public String getCreatorId() {
+        return this.creatorId;
+    }
+
+    public void setCreatorId(String creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public int getDistance() {
+        return this.distance;
+    }
+
+    public void setDistance(int distance) {
+        this.distance = distance;
+    }
+
+    public String getExtendJson() {
+        return this.extendJson;
+    }
+
+    public void setExtendJson(String extendJson) {
+        this.extendJson = extendJson;
+    }
+
+    public int getFixedShot() {
+        return this.fixedShot;
+    }
+
+    public void setFixedShot(int fixedShot) {
+        this.fixedShot = fixedShot;
+    }
+
+    public String getIsFixed() {
+        return this.isFixed;
+    }
+
+    public void setIsFixed(String isFixed) {
+        this.isFixed = isFixed;
+    }
+
+    public String getIsScore() {
+        return this.isScore;
+    }
+
+    public void setIsScore(String isScore) {
+        this.isScore = isScore;
+    }
+
+    public Date getLastUpdateTime() {
+        return this.lastUpdateTime;
+    }
+
+    public void setLastUpdateTime(Date lastUpdateTime) {
+        this.lastUpdateTime = lastUpdateTime;
+    }
+
+    public String getLatitude() {
+        return this.latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLevel() {
+        return this.level;
+    }
+
+    public void setLevel(String level) {
+        this.level = level;
+    }
+
+    public String getLongitude() {
+        return this.longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOffline() {
+        return this.offline;
+    }
+
+    public void setOffline(String offline) {
+        this.offline = offline;
+    }
+
+    public String getOrgCode() {
+        return this.orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
+
+    public String getPointNo() {
+        return this.pointNo;
+    }
+
+    public void setPointNo(String pointNo) {
+        this.pointNo = pointNo;
+    }
+
+    public String getRemark() {
+        return this.remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getRouteId() {
+        return this.routeId;
+    }
+
+    public void setRouteId(String routeId) {
+        this.routeId = routeId;
+    }
+
+    public String getRouteName() {
+        return this.routeName;
+    }
+
+    public void setRouteName(String routeName) {
+        this.routeName = routeName;
+    }
+
+    public String getSaveGps() {
+        return this.saveGps;
+    }
+
+    public void setSaveGps(String saveGps) {
+        this.saveGps = saveGps;
+    }
+
+    public int getShotMaxNumber() {
+        return this.shotMaxNumber;
+    }
+
+    public void setShotMaxNumber(int shotMaxNumber) {
+        this.shotMaxNumber = shotMaxNumber;
+    }
+
+    public int getShotMinNumber() {
+        return this.shotMinNumber;
+    }
+
+    public void setShotMinNumber(int shotMinNumber) {
+        this.shotMinNumber = shotMinNumber;
+    }
+
+    public String getUsuallyShot() {
+        return this.usuallyShot;
+    }
+
+    public void setUsuallyShot(String usuallyShot) {
+        this.usuallyShot = usuallyShot;
+    }
+
+    public boolean getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(boolean isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getChargeDeptId() {
+        return chargeDeptId;
+    }
+
+    public void setChargeDeptId(String chargeDeptId) {
+        this.chargeDeptId = chargeDeptId;
+    }
+
+    public String getChargePersonId() {
+        return chargePersonId;
+    }
+
+    public void setChargePersonId(String chargePersonId) {
+        this.chargePersonId = chargePersonId;
+    }
+
+    public Integer getFloor() {
+        return floor;
+    }
+
+    public void setFloor(Integer floor) {
+        this.floor = floor;
+    }
+
+    public String getOriginalId() {
+        return originalId;
+    }
+
+    public void setOriginalId(String originalId) {
+        this.originalId = originalId;
+    }
+    @Lob
+    @Column(name = "ue4_rotation")
+    public String getUe4Location() {
+        return ue4Location;
+    }
+
+    public void setUe4Location(String ue4Location) {
+        this.ue4Location = ue4Location;
+    }
+    @Lob
+    @Column(name = "ue4_location")
+    public String getUe4Rotation() {
+        return ue4Rotation;
+    }
+
+    public void setUe4Rotation(String ue4Rotation) {
+        this.ue4Rotation = ue4Rotation;
+    }
+}

amos-boot-system-equip/src/main/resources/application-dev.properties

 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://172.16.11.201/dl_business_v3.0.1.3?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+spring.datasource.url = jdbc:mysql://172.16.10.211/xiy_safety_business_v3.0.1_20100712?useUnicode=true&allowMultiQueries=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
 spring.datasource.username=root
 spring.datasource.password=Yeejoin@2020
 spring.datasource.type=com.zaxxer.hikari.HikariDataSource
@@ -14,10 +14,10 @@ spring.datasource.hikari.connection-test-query= SELECT 1
 
 
 # \u6587\u4EF6\u670D\u52A1\u5668\u5730\u5740
-fileserver_domain=http://172.16.11.201:9000/
+fileserver_domain=http://172.16.10.211:9000/
 
 #eureka.instance.ip-address= 172.16.3.135
-eureka.instance.hostname= 172.16.11.201
+eureka.instance.hostname= 172.16.10.211
 
 eureka.instance.prefer-ip-address = true
 eureka.client.serviceUrl.defaultZone: http://${eureka.instance.hostname}:10001/eureka/
@@ -33,9 +33,9 @@ security.appKeyApp=studio_normalapp_3056965
 
 
 spring.redis.database=1
-spring.redis.host=172.16.11.201
+spring.redis.host=172.16.10.211
 spring.redis.port=6379
-spring.redis.password=1234560
+spring.redis.password=yeejoin@2020
 spring.redis.lettuce.pool.max-active=200
 spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
@@ -45,10 +45,10 @@ spring.redis.expire.time=30000
 ## emqx
 emqx.clean-session=true
 emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
-emqx.broker=tcp://172.16.11.201:1883
+emqx.broker=tcp://172.16.10.211:2883
 emqx.user-name=admin
 emqx.password=public
-mqtt.scene.host=mqtt://172.16.11.201:8083/mqtt
+mqtt.scene.host=mqtt://172.16.10.211:8083/mqtt
 mqtt.client.product.id=mqtt
 mqtt.topic=topic_mqtt
 spring.mqtt.completionTimeout=3000

amos-boot-system-equip/src/main/resources/application.properties

-spring.application.name=AMOS-EQUIPMANAGE-WJ
+spring.application.name=AMOS-EQUIPMANAGE
 server.servlet.context-path=/equip
 server.port=8100
 #server.servlet.context-path=/case
-spring.profiles.active=dev2
+spring.profiles.active=dev
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #mybatis mapper file
 mybatis.mapper-locations=classpath:mapper/*.xml

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -104,7 +104,7 @@
                 and FIND_IN_SET(#{dangerId}, t.dangerIds)
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-                d.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
+                and d.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
         </trim>
     </select>
@@ -188,7 +188,7 @@
                 and FIND_IN_SET(#{dangerId}, t.dangerIds)
             </if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
-               d.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
+                and  d.biz_org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
         </trim>
         order by ${orderBy}