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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -173,7 +173,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             //增加人员权限
             List<String> lisk=new ArrayList<>();
             StdUserEmpower  stdUserEmpower= new StdUserEmpower();
-            lisk.add(publicAgencyUser.getAmosOrgCode());
+            //lisk.add(publicAgencyUser.getAmosOrgCode());
             lisk.add(re.getRegionalCompaniesCode());
             stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());
             stdUserEmpower.setAmosOrgCode(lisk);
@@ -287,7 +287,7 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
             uo.eq(StdUserEmpower::getAmosUserId,publicAgencyUser.getAmosUserId());
             StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
-            lisk.add(publicAgencyUser.getAmosOrgCode());
+           // lisk.add(publicAgencyUser.getAmosOrgCode());
             lisk.add(re.getRegionalCompaniesCode());
             if(stdUserEmpower!=null){
                 stdUserEmpower.setAmosUserId(publicAgencyUser.getAmosUserId());

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java

@@ -591,7 +591,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
                     publicAgencyUserMapper.insert(publicAgencyUser);
 
                     List<String> lis=new ArrayList<>();
-                    lis.add(unitInfo.getAmosCompanyCode());
+//                    lis.add(unitInfo.getAmosCompanyCode());
                     LambdaQueryWrapper<RegionalCompanies> queryWrapper = new LambdaQueryWrapper<RegionalCompanies>();
                     queryWrapper.eq(RegionalCompanies::getUnitInfoId, unitInfo.getSequenceNbr());
                     List<RegionalCompanies> list=  regionalCompaniesMapper.selectList(queryWrapper);
@@ -921,7 +921,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
        LambdaQueryWrapper<StdUserEmpower> uo=new LambdaQueryWrapper();
        uo.eq(StdUserEmpower::getAmosUserId,unitInfo.getAdminUserId());
        StdUserEmpower  stdUserEmpower= userEmpowerMapper.selectOne(uo);
-       lisk.add(unitInfo.getAmosCompanyCode());
+//       lisk.add(unitInfo.getAmosCompanyCode());
        if(stdUserEmpower!=null){
            stdUserEmpower.setAmosUserId(unitInfo.getAdminUserId());
            stdUserEmpower.setAmosOrgCode(lisk);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizFanHealthIndexController.java

@@ -779,7 +779,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				axisData.add(obj.getAnalysisTime());
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -800,9 +800,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
 				}
-				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
-				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
-				axisData.add(format);
+//				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+//				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -824,9 +824,9 @@ public class IdxBizFanHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5 ? 7.5 : dfSS.format(obj.getAnomaly()));
 				}
-				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
-				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
-				axisData.add(format);
+//				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+//				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/IdxBizPvHealthIndexController.java

@@ -440,7 +440,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				axisData.add(obj.getAnalysisTime());
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -461,9 +461,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
-				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
-				axisData.add(format);
+//				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+//				String format = DateUtil.format(dateTime, "yyyy-MM-dd HH:00");
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);
@@ -488,9 +488,9 @@ public class IdxBizPvHealthIndexController extends BaseController {
 				}else {
 					seriesData.add(obj.getAnomaly() > 7.5?7.5:dfSS.format(obj.getAnomaly()));
 				}
-				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
-				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
-				axisData.add(format);
+//				Date dateTime = DateUtil.parseDateTime(obj.getAnalysisTime());
+//				String format = DateUtil.format(dateTime, DatePattern.NORM_DATETIME_MINUTE_PATTERN);
+				axisData.add(obj.getRecDate());
 			}
 			result.put("seriesData",seriesData);
 			result.put("axisData",axisData);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/WarningRecordStatusMessage.java

@@ -77,7 +77,7 @@ public class WarningRecordStatusMessage extends EmqxListener {
             queryWrapper.eq("kks",jsonObject.getString("objectId"));
             if(params.length==3){
                 queryWrapper.eq("sub_system",params[0]);
-                queryWrapper.eq("health_level",params[1]);
+//                queryWrapper.eq("health_level",params[1]);
                 queryWrapper.eq("warning_period",params[2]);
             }
             List<FanWarningRecord> fanWarningRecords = fanWaringRecordMapper.selectList(queryWrapper);
@@ -128,7 +128,7 @@ public class WarningRecordStatusMessage extends EmqxListener {
             queryWrapper.eq("kks",jsonObject.getString("objectId"));
             if(params.length==3){
                 queryWrapper.eq("subarray",params[0]);
-                queryWrapper.eq("health_level",params[1]);
+//                queryWrapper.eq("health_level",params[1]);
                 queryWrapper.eq("warning_period",params[2]);
             }
             List<PvWarningRecord> pvWarningRecords = pvWaringRecordMapper.selectList(queryWrapper);

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/TdengineTimeServiceImpl.java

@@ -129,7 +129,9 @@ public class TdengineTimeServiceImpl {
             return;
         }
         idxFanHealthIndexMapper.deleteAllDataByTableName("fan_health_index_latest_data", WarningPeriodEnum.DAY.getName());
-        String recDate = DateUtil.format(new Date(), "yyyy-MM-dd");
+        Date recOriginalDate = new Date();
+        recOriginalDate  = DateUtil.offsetDay(recOriginalDate, -1);
+        String recDate = DateUtil.format(recOriginalDate, "yyyy-MM-dd");
         String startTime = DateUtils.dateFormat(DateUtils.dateAddHours(new Date(), -32), DateUtils.DATE_TIME_PATTERN);
         List<IdxBizFanHealthLevel> levelList = idxBizFanHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizFanHealthLevel>().eq(IdxBizFanHealthLevel::getAnalysisObjType, "测点").last("limit 4"));
         List<FanHealthIndex> fanHealthIndices = fanHealthIndexMapper.getInfoListByGroupByCdFan(startTime, "fan_health_index_hour", "测点");
@@ -266,7 +268,9 @@ public class TdengineTimeServiceImpl {
             return;
         }
         idxFanHealthIndexMapper.deleteAllDataByTableName("pv_health_index_latest_data", WarningPeriodEnum.DAY.getName());
-        String recDate = DateUtil.format(new Date(), "yyyy-MM-dd");
+        Date recOriginalDate = new Date();
+        recOriginalDate  = DateUtil.offsetDay(recOriginalDate, -1);
+        String recDate = DateUtil.format(recOriginalDate, "yyyy-MM-dd");
         List<IdxBizPvHealthLevel> levelList = idxBizPvHealthLevelMapper.selectList(new LambdaQueryWrapper<IdxBizPvHealthLevel>().eq(IdxBizPvHealthLevel::getAnalysisObjType, "测点").last("limit 4"));
         String startTime = DateUtils.dateFormat(DateUtils.dateAddHours(new Date(), -32), DateUtils.DATE_TIME_PATTERN);
         List<PvHealthIndex> fanHealthIndices = pvHealthIndexMapper.getInfoListByGroupByCdPv(startTime, "pv_health_index_hour", "测点");

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/FanHealthIndex.xml

@@ -173,7 +173,7 @@
         <if test="dto.analysisType!= null and dto.analysisType!= ''">and analysis_type = #{dto.analysisType}</if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
-        <if test="dto.area!= null and dto.area!= ''"> AND area = #{area} </if>
+        <if test="dto.area!= null and dto.area!= ''"> AND area = #{dto.area} </if>
         <if test="dto.number!= null and dto.number!= ''"> AND `number` = #{dto.number} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.station!= null and dto.station!= ''">AND station = #{dto.station} </if>
@@ -202,7 +202,7 @@
         <if test="dto.analysisType!= null and dto.analysisType!= ''">and analysis_type = #{dto.analysisType}</if>
         <if test="dto.endDate!= null and dto.endDate!= '' ">  and ts &lt;= #{dto.endDate} </if>
         <if test="dto.startDate!= null and dto.startDate!= ''">  and  ts &gt;= #{dto.startDate} </if>
-        <if test="dto.area!= null and dto.area!= ''"> AND area = #{area} </if>
+        <if test="dto.area!= null and dto.area!= ''"> AND area = #{dto.area} </if>
         <if test="dto.number!= null and dto.number!= ''"> AND `number` = #{dto.number} </if>
         <if test="dto.pointName!= null and dto.pointName!= ''">AND point_name = #{dto.pointName} </if>
         <if test="dto.station!= null and dto.station!= ''">AND station = #{dto.station} </if>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -693,6 +693,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
                 }else{
                     stdUserEmpowerhygf.setAmosOrgCode(re);
                 }
+            }else{
+                stdUserEmpowerhygf.setAmosOrgCode(re);
             }
             List<String> exre=  personAccount.getExternalRegionalCompaniesSeq();
 //            if(exre!=null&&!exre.isEmpty()){