Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

amos-boot-system-tzs/amos-boot-module-96333/amos-boot-module-96333-biz/src/main/java/com/yeejoin/amos/boot/module/elevator/biz/service/impl/AlertCalledServiceImpl.java

@@ -58,6 +58,7 @@ import org.springframework.core.io.Resource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.DateUtil;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
@@ -1275,6 +1276,11 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         HashMap<String, Object> qrcode = new HashMap<>();
         if (!ObjectUtils.isEmpty(alertCalledFormVo.getAlertCalledDto())) {
             qrcode.put("value", alertCalledFormVo.getAlertCalledDto().getRegistrationCode());
+            try {
+                qrcode.put("problemTime", DateUtil.formatDate(new Date(), DateUtil.Y_M_D_HMS));
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         // 96333码
         HashMap<String, Object> qrcode2 = new HashMap<>();
@@ -1284,7 +1290,7 @@ public class AlertCalledServiceImpl extends BaseService<AlertCalledDto,AlertCall
         datas.put("datas", records);
         datas.put("title", "处置记录");
         datas.put("renderType", "timeline");
-        keyinfoData.put("title", objectMap.get("useUnitName"));
+        keyinfoData.put("title", ObjectUtils.isEmpty(useUnitMap.get("useUnitName")) ? null : String.valueOf(useUnitMap.get("useUnitName")));
         keyinfoData.put("keyParams", jsonData);
         keyinfoData.put("infoRecords", datas);
         keyinfoData.put("qrcode", qrcode);

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/AQZSDPStatisticsMapper.xml

@@ -387,10 +387,10 @@
 				and spt.problem_type_code = #{problemModel.problemTypeCode}
 			</if>
 			<if test="problemModel.problemTimeStart != null and problemModel.problemTimeStart != ''">
-				and cast(spt.problem_time AS DATE) >= #{problemModel.problemTimeStart}
+				and cast(spt.problem_time AS DATE) >= cast(#{problemModel.problemTimeStart} AS DATE)
 			</if>
 			<if test="problemModel.problemTimeEnd != null and problemModel.problemTimeEnd != ''">
-				and cast(spt.problem_time AS DATE) <![CDATA[<=]]> #{problemModel.problemTimeEnd}
+				and cast(spt.problem_time AS DATE) <![CDATA[<=]]> cast(#{problemModel.problemTimeEnd} AS DATE)
 			</if>
 			<if test="problemModel.problemDesc != null and problemModel.problemDesc != ''">
 				and spt.problem_desc like CONCAT('%', #{problemModel.problemDesc}, '%')

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/controller/CylinderDPStatisticsController.java

@@ -117,7 +117,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "区域安全指数排名下钻树节点")
     @PostMapping(value = "/securityIndexSubTree")
-    public ResponseModel<SubTreeDto> securityIndexSubTree() {
+    public ResponseModel<List<SubTreeDto>> securityIndexSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubTree());
     }
 
@@ -131,7 +131,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "充装量/卸液量下钻树节点")
     @PostMapping(value = "/getFillingSubTree")
-    public ResponseModel<SubTreeDto> getFillingSubTree() {
+    public ResponseModel<List<SubTreeDto>> getFillingSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.getFillingSubTree());
     }
 
@@ -160,7 +160,7 @@ public class CylinderDPStatisticsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻树节点")
     @PostMapping(value = "/getStationRateSubTree")
-    public ResponseModel<SubTreeDto> getStationRateSubTree() {
+    public ResponseModel<List<SubTreeDto>> getStationRateSubTree() {
         return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubTree());
     }
 

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/CylinderDPStatisticsServiceImpl.java

@@ -468,11 +468,13 @@ public class CylinderDPStatisticsServiceImpl {
         return result;
     }
 
-    public SubTreeDto securityIndexSubTree() {
+    public List<SubTreeDto> securityIndexSubTree() {
+        List<SubTreeDto> list = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
-        subTreeDto.setTitle(CylinderTypeEnum.CYLINDER.getCode());
-        subTreeDto.setValue("气" + CylinderTypeEnum.CYLINDER.getName());
-        return subTreeDto;
+        subTreeDto.setValue(CylinderTypeEnum.CYLINDER.getCode());
+        subTreeDto.setTitle("气" + CylinderTypeEnum.CYLINDER.getName());
+        list.add(subTreeDto);
+        return list;
     }
 
     public Map<String, Object> securityIndexSubChart(DPFilterParamDto dpFilterParamDto) {
@@ -488,11 +490,19 @@ public class CylinderDPStatisticsServiceImpl {
         });
         Map<String, Object> result = new HashMap<>();
         result.put("xdata", xdata);
-        result.put("ydata", yData);
+        result.put("securityIndex", yData);
+        List<Map<String, Object>> legendData = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("dataKey", "securityIndex");
+        map.put("value", "各地市区域安全指数");
+        map.put("chartType", "bar");
+        legendData.add(map);
+        result.put("legendData", legendData);
         return result;
     }
 
-    public SubTreeDto getFillingSubTree() {
+    public List<SubTreeDto> getFillingSubTree() {
+        List<SubTreeDto> list = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
         subTreeDto.setTitle("气" + CylinderTypeEnum.CYLINDER.getName());
         subTreeDto.setValue(CylinderTypeEnum.CYLINDER.getCode());
@@ -506,7 +516,8 @@ public class CylinderDPStatisticsServiceImpl {
             }
         }
         subTreeDto.setChildren(children);
-        return subTreeDto;
+        list.add(subTreeDto);
+        return list;
     }
 
     public Map<String, Object> getFillingSubChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
@@ -730,7 +741,8 @@ public class CylinderDPStatisticsServiceImpl {
     }
 
 
-    public SubTreeDto getStationRateSubTree() {
+    public List<SubTreeDto> getStationRateSubTree() {
+        List<SubTreeDto> subTreeDtos = new ArrayList<>();
         SubTreeDto subTreeDto = new SubTreeDto();
         subTreeDto.setTitle("企业类型");
         subTreeDto.setValue("");
@@ -740,7 +752,8 @@ public class CylinderDPStatisticsServiceImpl {
         subTree.setValue("1231");
         children.add(subTree);
         subTreeDto.setChildren(children);
-        return subTreeDto;
+        subTreeDtos.add(subTreeDto);
+        return subTreeDtos;
     }
 
     public Map<String, Object> getStationRateSubChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {