Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/ElevatorDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -19,7 +19,7 @@ import java.util.Date;
 @Accessors(chain = true)
 @TableName("tcb_elevator")
 @ApiModel(value = "ElevatorDto", description = "ElevatorDto")
-public class ElevatorDto extends BaseEntity {
+public class ElevatorDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/MaintenanceUnitDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("cb_maintenance_unit")
 @ApiModel(value = "MaintenanceUnitDto", description = "MaintenanceUnitDto")
-public class MaintenanceUnitDto extends BaseEntity {
+public class MaintenanceUnitDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/RescueStationDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("tcb_rescue_station")
 @ApiModel(value = "RescueStationDto", description = "RescueStationDto")
-public class RescueStationDto extends BaseEntity {
+public class RescueStationDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/dto/UseUnitDto.java

 package com.yeejoin.amos.boot.module.tzs.api.dto;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
 @Accessors(chain = true)
 @TableName("tcb_use_unit")
 @ApiModel(value = "UseUnitDto", description = "UseUnitDto")
-public class UseUnitDto extends BaseEntity {
+public class UseUnitDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
 

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/AlertStageEnums.java

+package com.yeejoin.amos.boot.module.tzs.api.enums;
+/**
+ * 
+ * 警情类型枚举
+ * @author litw
+ * @date 2021-08-03
+ * ***/
+public  enum  AlertStageEnums {
+
+	
+	//报警类型
+	JQCB("297","警情初报"),
+	JQGB("298","警情归并"),
+
+	//警情类型
+	
+	KRJY("247","困人救援"),
+	GZWX("248",	"故障维修"),
+	TSZX("249",	"投诉咨询"),
+
+	// 来源类型
+	DHBJ("233","电话报警"),
+
+	// 警情阶段
+	JJ("240","接警"),
+	PQ("241","派遣"),
+	DD("242","抵达"),
+	HF("243","回访"),
+	WX("244","维修"),
+	FK("245","反馈");
+
+
+
+	
+	private String code;
+	private String value;
+	AlertStageEnums(String code, String value) {
+		this.code=code;
+		this.value=value;
+	}
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getValue() {
+		return value;
+	}
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+	
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/api/enums/AlertStatusEnum.java

+package com.yeejoin.amos.boot.module.tzs.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 
+ * <pre>
+ * 警情状态枚举
+ * </pre>
+ *
+ * @author litw
+ * @date 2021-08-03
+ */
+@Getter
+@AllArgsConstructor
+public enum AlertStatusEnum {
+
+	UNCLOSED("unclosed", "未结案"),
+	CLOSED("closed", "已结案");
+
+    private String code;
+    private String name;
+
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+    
+	public static AlertStatusEnum getEnum(String code)
+	{
+		for (AlertStatusEnum status : AlertStatusEnum.values())
+		{
+			if (status.getCode().equals(code))
+			{
+				return status;
+			}
+		}
+		return null;
+	}
+}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/WaterResourceController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
@@ -88,6 +90,22 @@ public class WaterResourceController extends BaseController {
         model.setResourceTypeName(resourceTypeEnum.get().getName());
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));
         model.setOrientationImg(JSONArray.toJSONString(model.getOrientationImgList()));
+        
+        
+        if(model.getAddress()!=null){
+			String[]  data= model.getAddress().split("@address@");
+			model.setAddress(data[0]);
+			 if(data[1]!=null&&!"".equals(data[1])){
+				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+				 }
+                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+				 }
+			 }
+		 }
+         
         if (!StringUtils.isEmpty(resourceType)) {
             switch (resourceType) {
                 case "hydrant":
@@ -156,6 +174,21 @@ public class WaterResourceController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<WaterResourceDto> updateBySequenceNbrWaterResource(@RequestBody WaterResourceDto model,
                                                                             @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+    	
+    	
+    	 if(model.getAddress()!=null){
+ 			String[]  data= model.getAddress().split("@address@");
+ 			model.setAddress(data[0]);
+ 			 if(data[1]!=null&&!"".equals(data[1])){
+ 				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+ 				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+ 					 model.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+ 				 }
+                  if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                 	 model.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+ 				 }
+ 			 }
+ 		 }    	  	
         // 更新基本信息
         model.setSequenceNbr(sequenceNbr);
         model.setRealityImg(JSONArray.toJSONString(model.getRealityImgList()));

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/LinkageUnitServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.google.common.collect.Lists;
@@ -81,7 +83,23 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
      */
     @Transactional
     public LinkageUnitDto saveModel(LinkageUnitDto linkageUnitDto) {
-        //1.保存行数据
+    	
+    	
+    	
+    	if(linkageUnitDto.getAddress()!=null){
+			String[]  data= linkageUnitDto.getAddress().split("@address@");
+			linkageUnitDto.setAddress(data[0]);
+			 if(data[1]!=null&&!"".equals(data[1])){
+				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+					 linkageUnitDto.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+				 }
+                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                	 linkageUnitDto.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+				 }
+			 }
+		 }
+         //1.保存行数据
         String groupCode = this.getGroupCode();
         Map<String, Object> map = Bean.BeantoMap(linkageUnitDto);
         Long instanceId = dynamicFormInstanceService.commonSave(groupCode, map);
@@ -126,6 +144,20 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 
     @Transactional
     public LinkageUnitDto updateById(LinkageUnitDto linkageUnitDto) {
+    	    	
+    	if(linkageUnitDto.getAddress()!=null){
+			String[]  data= linkageUnitDto.getAddress().split("@address@");
+			linkageUnitDto.setAddress(data[0]);
+			 if(data[1]!=null&&!"".equals(data[1])){
+				 JSONObject jSONObject = JSON.parseObject(data[1]);				 
+				 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+					 linkageUnitDto.setLongitude(Double.valueOf(jSONObject.getString("longitude")));
+				 }
+                 if(jSONObject.getString("longitude")!=null&&!"".equals(jSONObject.getString("longitude"))) {
+                	 linkageUnitDto.setLatitude(Double.valueOf(jSONObject.getString("latitude")));
+				 }
+			 }
+		 }  	
         // 修改基本信息
         updateWithModel(linkageUnitDto);
         // 修改行信息

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/ExcelController.java

@@ -172,6 +172,22 @@ public class ExcelController extends BaseController {
     }
 
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @ApiOperation(value = "下载模板")
+    @GetMapping("/download/template")
+    public void downloadTemplate(HttpServletResponse response, @RequestParam(required = false) String fileName,
+                                 @RequestParam(required = false) String sheetName, @RequestParam String classUrl) {
+        try {
+            String url = classUrl;
+            Class<?> clz = Class.forName(url);
+            ExcelUtil.createTemplate(response, fileName, sheetName, null, clz,
+                    dataSourcesImpl, true);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException("系统异常！");
+        }
+    }
+
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @ApiOperation(value = "导出公用类")
     @GetMapping("/export")
     public void getFireStationFile(HttpServletResponse response, ExcelDto excelDto) {

amos-boot-system-tzs/src/main/java/com/yeejoin/amos/AmosTzsApplication.java

@@ -40,7 +40,8 @@ import java.net.UnknownHostException;
         "org.typroject.tyboot.face.*.orm.dao*",
         "org.typroject.tyboot.core.auth.face.orm.dao*",
         "org.typroject.tyboot.component.*.face.orm.dao*",
-        "com.yeejoin.amos.boot.module.tzs.api.mapper"})
+        "com.yeejoin.amos.boot.module.tzs.api.mapper",
+        "com.yeejoin.amos.boot.biz.common.dao.mapper"})
 @ComponentScan(basePackages = { "org.typroject", "com.yeejoin.amos" })
 public class AmosTzsApplication {
     private static final Logger logger = LoggerFactory.getLogger(AmosTzsApplication.class);

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

@@ -19,3 +19,13 @@ spring.redis.lettuce.pool.max-wait=-1
 spring.redis.lettuce.pool.max-idle=10
 spring.redis.lettuce.pool.min-idle=0
 spring.redis.expire.time=300
+
+## emqx properties:
+emqx.clean-session=true
+emqx.client-id=${spring.application.name}-${random.int[1024,65536]}
+emqx.broker=tcp://172.16.10.85:1883
+emqx.user-name=super
+emqx.password=a123456
+
+## redisʱʱ
+redis.cache.failure.time=10800