#bug修改

hzims-service-api/inspect-api/src/main/java/com/hnac/hzinfo/inspect/plan/vo/PlanListQueryVO.java

@@ -86,4 +86,8 @@ public class PlanListQueryVO implements Serializable {
     @ApiModelProperty("业务状态 0:待审核-->1:已审核-->2:派发中-->3:暂停-->4:结束-->5审核不通过-->6待提交")
     @QueryField(condition = SqlCondition.EQUAL)
     private Integer status;
+
+    @ApiModelProperty("创建机构")
+    @QueryField(condition = SqlCondition.EQUAL)
+    private Long createDept;
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/InspectObjectMapper.xml

@@ -28,6 +28,9 @@
         <if test="obj.tenantId != null and obj.tenantId != ''">
             and OBJ.`TENANT_ID` = #{obj.tenantId}
         </if>
+        <if test="obj.createDept != null">
+            and OBJ.`CREATE_DEPT` = #{obj.createDept}
+        </if>
         ORDER BY OBJ.UPDATE_TIME DESC
     </select>
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ContentListQueryVO.java

@@ -67,4 +67,8 @@ public class ContentListQueryVO implements Serializable {
 	@QueryField(condition = SqlCondition.EQUAL)
 	@ApiModelProperty(value = "支持的巡检类型  0普通巡检，1视频自动巡检，2机器人巡检")
 	private Integer supportAutoVideo;
+
+    @QueryField(condition = SqlCondition.EQUAL)
+    @ApiModelProperty(value = "创建机构")
+    private Long createDept;
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/ProjectListQueryVO.java

@@ -51,4 +51,8 @@ public class ProjectListQueryVO implements Serializable {
 	@ApiModelProperty(value = " inspectType 支持的巡检类型  0普通巡检，1视频自动巡检，2机器人巡检")
 	private String supportAutoVideo;
 
+    @QueryField(condition = SqlCondition.EQUAL)
+    @ApiModelProperty(value = "创建机构")
+    private Long createDept;
+
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/vo/TemplateListQueryVO.java

@@ -51,5 +51,7 @@ public class TemplateListQueryVO implements Serializable {
 	@ApiModelProperty(value = "是否支持视频自动巡检")
 	private Integer supportAutoVideo;
 
-
+    @QueryField(condition = SqlCondition.EQUAL)
+    @ApiModelProperty(value = "创建机构")
+    private Long createDept;
 }

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/plan/controller/PlanController.java

@@ -80,6 +80,9 @@ public class PlanController extends BladeController {
 		if(plan.getStatus()==null){
 			queryWrapper.ne(PlanEntity::getStatus, PlanContants.PlanStatusEnum.PLAN_AUTH.getStatus());
 		}
+		if(plan.getCreateDept()!=null){
+			queryWrapper.eq(PlanEntity::getCreateDept,plan.getCreateDept());
+		}
 		queryWrapper.orderByDesc(PlanEntity::getUpdateTime);
 		IPage<PlanEntity> pages = planService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.eq(PlanEntity::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(pages);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java

@@ -113,7 +113,7 @@ public class TaskController extends BladeController {
 			task.setCurUserId(AuthUtil.getUserId());
 			task.setTenantId(AuthUtil.getTenantId());
 		}
-		if (task.getCurUserId().longValue() == -1) {
+		if (task.getCurUserId() == -1) {
 			task.setCurUserId(null);
 		}
 		List<TaskVo> list = taskService.getListPage(pages,task);

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/TaskMapper.xml

@@ -74,6 +74,9 @@
     <if test="task.autoVideo != null">
         and t.AUTO_VIDEO=#{task.autoVideo}
     </if>
+    <if test="task.createDept != null">
+        and t.CREATE_DEPT=#{task.createDept}
+    </if>
     order by t.UPDATE_TIME desc
 </select>
 

hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/TaskListQuery.java

@@ -126,5 +126,8 @@ public class TaskListQuery implements Serializable {
 	 */
 	private String areaId;
 
-
+	/**
+	 * 创建机构
+	 */
+	private Long createDept;
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/mapper/OperAccessStatisticsMapper.xml

@@ -40,6 +40,9 @@
         <if test="dto.areaId != null and dto.areaId != ''">
             and OT.CREATE_DEPT = #{dto.areaId}
         </if>
+        <if test="dto.createDept != null and dto.createDept != ''">
+            and OT.CREATE_DEPT = #{dto.createDept}
+        </if>
         <if test="dto.yearMonth != null">
             and date_format(OT.PLAN_START_TIME,'%Y-%m') = #{dto.yearMonth}
         </if>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/service/impl/HistoryAbnormalAlarmServiceImpl.java

@@ -23,7 +23,6 @@ import com.hnac.hzinfo.datasearch.soe.domian.SoeData;
 import com.hnac.hzinfo.datasearch.soe.domian.SoeQueryConditionByStation;
 import com.hnac.hzinfo.sdk.core.response.HzPage;
 import com.hnac.hzinfo.sdk.core.response.Result;
-import com.hnac.hzinfo.sdk.v5.soe.SoeClient;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.logstash.logback.encoder.org.apache.commons.lang3.ObjectUtils;

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java

@@ -85,6 +85,9 @@ public class OperDefectController extends BladeController {
         if (defect.getEndTime() != null) {
             queryWrapper.le(OperDefectEntity::getCreateTime, defect.getEndTime());
         }
+        if (defect.getCreateDept() != null) {
+            queryWrapper.eq(OperDefectEntity::getCreateDept, defect.getCreateDept());
+        }
         queryWrapper.orderByDesc(OperDefectEntity::getActStartTime);
         IPage<OperDefectEntity> pages = defectService.page(Condition.getPage(query), queryWrapper);
         IPage<OperDefectVO> vos = OperDefectWrapper.build().pageVO(pages);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java

@@ -7,6 +7,7 @@ import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
 import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.operational.defect.dto.OperDefectStatisticsDTO;
+import com.hnac.hzims.operational.defect.entity.OperDefectEntity;
 import com.hnac.hzims.operational.defect.entity.OperDefectStatisticsEntity;
 import com.hnac.hzims.operational.defect.entity.OperFaultEntity;
 import com.hnac.hzims.operational.defect.service.IOperDefectStatisticsService;
@@ -79,6 +80,9 @@ public class OperDefectStatisticsController extends BladeController {
 		if(entity.getActEndTime()!=null){
 			queryWrapper.le(OperDefectStatisticsEntity::getActStartTime,entity.getActEndTime());
 		}
+		if (entity.getCreateDept() != null) {
+			queryWrapper.eq(OperDefectStatisticsEntity::getCreateDept, entity.getCreateDept());
+		}
 		queryWrapper.orderByDesc(OperDefectStatisticsEntity::getActStartTime);
 		IPage<OperDefectStatisticsEntity> pages = statisticsService.page(Condition.getPage(query), queryWrapper);
 		IPage<OperDefectStatisticsVO> vos = OperDefectStatisticsWrapper.build().pageVO(pages);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java

@@ -86,6 +86,9 @@ public class OperPhenomenonController extends BladeController {
         if (Func.isNotEmpty(entity.getDiscriminateStatus())) {
             queryWrapper.eq(OperPhenomenonEntity::getDiscriminateStatus, entity.getDiscriminateStatus());
         }
+        if (Func.isNotEmpty(entity.getCreateDept())) {
+            queryWrapper.eq(OperPhenomenonEntity::getCreateDept, entity.getCreateDept());
+        }
 
         // // 区域Id
         // if (Func.isNotEmpty(entity.getAreaId())) {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/mapper/MainWorkBenchMapper.xml

@@ -69,7 +69,7 @@
             and (NOT EXCLUDE_DEPT like #{excludeDept} OR EXCLUDE_DEPT IS NULL OR EXCLUDE_DEPT = '')
         </if>
         <if test="ascriptionUser != null">
-            and (ASCRIPTION_USER like #{ascriptionUser} OR ASCRIPTION_USER IS NULL OR ASCRIPTION_USER = '')
+            and (ASCRIPTION_USER like concat('%',#{ascriptionUser},'%') OR ASCRIPTION_USER IS NULL OR ASCRIPTION_USER = '')
         </if>
          order by ord
     </select>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/main/service/impl/MainWorkBenchServiceImpl.java

@@ -163,7 +163,7 @@ public class MainWorkBenchServiceImpl extends BaseServiceImpl<MainWorkBenchMappe
 		// 首页分类类型 : 集团、省子公司、区域、站点
 		Optional<Dept> optionalDept = deptByCurrentUser.getData().stream().min(Comparator.comparing(Dept::getDeptCategory));
 		Integer deptCategory = optionalDept.isPresent() ? optionalDept.map(Dept::getDeptCategory).orElse(null) : null;
-		Dept dept = optionalDept.isPresent() ? optionalDept.get() : null;
+		Dept dept = optionalDept.orElse(null);
 		//Integer deptCategory = deptByCurrentUser.getData().stream().min(Comparator.comparing(Dept::getDeptCategory)).get().getDeptCategory();
 		// 所属机构
 		List<Long> deptList = deptByCurrentUser.getData().stream().map(Dept::getId).collect(Collectors.toList());

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java

@@ -895,7 +895,6 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 				weather.setIcon(now.getIcon());
 				weather.setTemp(now.getTemp());
 				weather.setText(now.getText());
-				station.setPrecipitation(now.getPrecip());
 			}
 		}
 		// 站点七日内天气
@@ -906,6 +905,7 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 				Daily daily = dailyList.stream().sorted(Comparator.comparing(Daily::getFxDate)).collect(Collectors.toList()).get(0);
 				weather.setTempMin(daily.getTempMin());
 				weather.setTempMax(daily.getTempMax());
+				station.setPrecipitation(daily.getPrecip());
 			}
 		}
 		station.setNowWater(weather);

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java

@@ -107,6 +107,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl<StandardTicke
     @Override
     public R<IPage<StandardTicketInfoVO>> queryList(StandardTicketInfoDto req, Query query) {
         LambdaQueryWrapper<StandardTicketInfoEntity> queryWrapper = this.getQueryWrapper(req);
+        queryWrapper.eq(StandardTicketInfoEntity::getCreateDept,req.getCreateDept());
         queryWrapper.orderByDesc(StandardTicketInfoEntity::getCreateTime);
         IPage pages = super.page(Condition.getPage(query), queryWrapper);
         return R.data(pages.setRecords(StandardTicketInfoWrapper.build().listVO(pages.getRecords())));

hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java

@@ -236,6 +236,7 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl<WorkTicketInfoMap
     @Override
     public R<IPage<WorkTicketInfoVO>> queryList(WorkTicketInfoDto req, Query query) {
         LambdaQueryWrapper<WorkTicketInfoEntity> lqw = this.getQueryWrapper(req);
+        lqw.eq(WorkTicketInfoEntity::getCreateDept,req.getCreateDept());
         lqw.orderByDesc(WorkTicketInfoEntity::getCreateTime).orderByDesc(WorkTicketInfoEntity::getUpdateTime);
         IPage pages = super.page(Condition.getPage(query), lqw);
         pages.setRecords(WorkTicketInfoWrapper.build().listVO(pages.getRecords()));