Merge remote-tracking branch 'origin/master'

hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/vo/SpWarehouseExportVO.java

@@ -0,0 +1,61 @@
+package com.hnac.hzims.spare.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ *  模型VO
+ *
+ * @author Chill
+ */
+@Data
+public class SpWarehouseExportVO {
+
+	private static final long serialVersionUID = 1L;
+	/**
+	 * 单据号
+	 */
+	@ColumnWidth(25)
+	@ExcelProperty(value = "单据编码", index = 0)
+	@ApiModelProperty(value = "单据号")
+	private String code;
+
+	/**
+	 * 仓库名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty(value = "出库库房", index = 1)
+	@ApiModelProperty(value = "仓库名称")
+	private String warehouseName;
+	/**
+	 * 出库类型名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty(value = "出库类型", index = 2)
+	@ApiModelProperty(value = "出库类型名称")
+	private String typeName;
+	/**
+	 * 用户名称
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty(value = "领用人", index = 3)
+	@ApiModelProperty(value = "用户名称")
+	private String userName;
+
+	@DateTimeFormat(
+			pattern = "yyyy-MM-dd HH:mm:ss"
+	)
+	@ColumnWidth(20)
+	@ExcelProperty(value = "出库时间", index = 4)
+	@ApiModelProperty("创建时间")
+	private String createTime;
+
+}

hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenanceLibraryEntity.java

@@ -132,4 +132,6 @@ public class OperMaintenanceLibraryEntity extends TenantEntity {
 	@QueryField(condition = SqlCondition.LIKE)
 	private Long createDept;
 
+	@ApiModelProperty("班次树，机构-班次类型-班次")
+	private String dutyClassTree;
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/controller/SpWarehouseOutController.java

@@ -1,5 +1,6 @@
 package com.hnac.hzims.spare.controller;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.common.logs.annotation.OperationAnnotation;
@@ -7,20 +8,33 @@ import com.hnac.hzims.common.logs.enums.BusinessType;
 import com.hnac.hzims.common.logs.enums.OperatorType;
 import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.service.ISpWarehouseOutService;
+import com.hnac.hzims.spare.vo.SpWarehouseExportVO;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
+import com.hnac.hzims.vo.VoteChartVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.log.annotation.ApiLog;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -62,6 +76,44 @@ public class SpWarehouseOutController extends BladeController {
 		return R.data(pages);
 	}
 	/**
+	 * 分页 代码自定义代号
+	 */
+	@ApiLog
+	@GetMapping("/exportList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入sp_warehouse_out")
+	@OperationAnnotation(moduleName = "资产管理",title = "出库单",operatorType = OperatorType.MOBILE,businessType =
+			BusinessType.GENCODE,
+			action = "导出出库单列表")
+	public void exportList(HttpServletResponse response, SpWarehouseOutVO warehouseOutVO) {
+		if(ObjectUtil.isEmpty(AuthUtil.getUser())||ObjectUtil.isEmpty(AuthUtil.getUser().getUserId())){
+			throw new ServiceException("暂无权限查看，请稍后重试");
+		}
+		List<SpWarehouseOutVO> outVOList=sp_warehouse_outService.exportList(warehouseOutVO);
+		List<SpWarehouseExportVO> list = outVOList.stream().map(s -> {
+			SpWarehouseExportVO spWarehouseExportVO = new SpWarehouseExportVO();
+			BeanUtil.copy(s, spWarehouseExportVO);
+			spWarehouseExportVO.setCreateTime(DateUtil.formatDateTime(s.getCreateTime()));
+			return spWarehouseExportVO;
+		}).collect(Collectors.toList());
+		String nowTime = DateUtil.formatDateTime(new Date());
+		// 下载导出
+		String filename = nowTime +"出库单";
+		// 设置头信息
+		response.setCharacterEncoding("UTF-8");
+		response.setContentType("application/vnd.ms-excel");
+		try {
+			//设置xlsx格式
+			response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename + ".xlsx", "UTF-8"));
+			//创建一个输出流
+			EasyExcel.write(response.getOutputStream(), SpWarehouseExportVO.class).autoCloseStream(Boolean.TRUE).sheet(1,"出库单")
+					.doWrite(list);
+			response.getOutputStream().close();
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	/**
 	 * 工单预警
 	 */
 	@GetMapping("/warnList")

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
+import feign.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -26,6 +27,8 @@ public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper<SpWarehous
      */
 	@UserDataAuth
     List<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page, Map<String,Object> params);
+//    @UserDataAuth
+    List<SpWarehouseOutVO> selectListByCondition( Map<String,Object> params);
     /**
      * 根据工单ID查询出库单编码
      * @param ticketId

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml

@@ -76,6 +76,53 @@
         order by wo.CREATE_TIME desc
     </select>
 
+    <select id="selectListByCondition" resultType="com.hnac.hzims.spare.vo.SpWarehouseOutVO" parameterType="java.util.Map">
+        SELECT
+        wo.id,
+        wo.CODE,
+        wo.CREATE_USER,
+        wo.CREATE_TIME,
+        wo.TYPE,
+        wo.`STATUS`,
+        wo.STORAGE_ROOM,
+        wo.CREATE_DEPT,
+        sw.`NAME` AS warehouseName,
+        sw.AFFILIATED_UNIT,
+        sw.AFFILIATED_NAME AS affiliatedName
+        FROM
+        wt_sp_warehouse_out wo
+        JOIN wt_sp_warehouse sw ON wo.STORAGE_ROOM = sw.id
+        WHERE wo.IS_DELETED = 0
+        <if test="code !=null">
+            and wo.code like  concat('%',#{code},'%')
+        </if>
+        <if test="type!=null">
+            and wo.type = #{type}
+        </if>
+        <if test="status!=null">
+            and wo.status = #{status}
+        </if>
+        <if test="createTime!=null">
+            and wo.CREATE_TIME <![CDATA[ <= ]]> #{createTime}
+        </if>
+        <if test="startDate!=null">
+            and wo.CREATE_TIME <![CDATA[ >= ]]> #{startDate}
+        </if>
+        <if test="endDate!=null">
+            and wo.CREATE_TIME <![CDATA[ <= ]]> #{endDate}
+        </if>
+        <if test="deptList!=null">
+            and sw.AFFILIATED_UNIT in
+            <foreach collection="params.deptList" item="item" open="(" close=")" separator="," >
+                #{item}
+            </foreach>
+        </if>
+        <if test="warehouseId!=null">
+            and wo.STORAGE_ROOM = #{warehouseId}
+        </if>
+        order by wo.CREATE_TIME desc
+    </select>
+
     <select id="getReceiveCode" resultType="java.lang.String">
         select o.`CODE` from spare.wt_sp_warehouse_out o,spare.wt_sp_ticket_relation r where o.ID = r.ORDER_ID and r.TICKET = #{ticektId}
     </select>

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/ISpWarehouseOutService.java

@@ -6,6 +6,8 @@ import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.mp.support.Query;
 
+import java.util.List;
+
 /**
  *  服务类
  *
@@ -43,6 +45,12 @@ public interface ISpWarehouseOutService extends BaseService<SpWarehouseOutEntity
      * @return
      */
     IPage<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page, SpWarehouseOutVO warehouseOutVO) ;
+    /**
+     * 导出列表
+     * @param warehouseOutVO
+     * @return
+     */
+    List<SpWarehouseOutVO> exportList( SpWarehouseOutVO warehouseOutVO) ;
 
     /**
      * 修改状态

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpWarehouseOutServiceImpl.java

@@ -277,7 +277,6 @@ public class SpWarehouseOutServiceImpl extends BaseServiceImpl<SpWarehouseOutMap
         spWarehouseOutVO.setBasicVOList(basicVOList);
         return spWarehouseOutVO;
     }
-
     @Override
     public IPage<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page, SpWarehouseOutVO warehouseOutVO) {
         Map<String,Object> params = new HashMap<>();
@@ -328,6 +327,63 @@ public class SpWarehouseOutServiceImpl extends BaseServiceImpl<SpWarehouseOutMap
         return page.setRecords(result);
     }
 
+    @Override
+    public List<SpWarehouseOutVO> exportList( SpWarehouseOutVO warehouseOutVO) {
+        Map<String,Object> params = new HashMap<>();
+        if(null !=warehouseOutVO.getCode()){
+            params.put("code",warehouseOutVO.getCode());
+        }
+        if(null !=warehouseOutVO.getType()){
+            params.put("type",warehouseOutVO.getType());
+        }
+        if(null !=warehouseOutVO.getStatus()){
+            params.put("status",warehouseOutVO.getStatus());
+        }
+        if(null !=warehouseOutVO.getStartDate()){
+            params.put("startDate",warehouseOutVO.getStartDate());
+        }
+        if(null !=warehouseOutVO.getEndDate()){
+            params.put("endDate",warehouseOutVO.getEndDate());
+        }
+        List<Long> longList = new ArrayList<>();
+        if(null!=warehouseOutVO.getDeptId()){
+            R<List<Dept>> deptList = sysClient.getDeptChild(warehouseOutVO.getDeptId());
+            for (int i = 0; i < deptList.getData().size(); i++) {
+                longList.add(deptList.getData().get(i).getId());
+            }
+            longList.add(warehouseOutVO.getDeptId());
+        }else{
+//            longList = personClient.getShuiChangId(AuthUtil.getDeptId());
+        }
+        if(longList.size()>0){
+            params.put("deptList",longList);
+        }
+        if(null!=warehouseOutVO.getStorageRoom()){
+            params.put("warehouseId",warehouseOutVO.getStorageRoom());
+        }
+        params.put("tenantId", AuthUtil.getTenantId());
+        Query query = new Query();
+        query.setCurrent(0);
+        query.setSize(100);
+        List<SpWarehouseOutVO> list =  baseMapper.selectListByCondition(params);
+        List<SpWarehouseOutVO> result = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            SpWarehouseOutVO entity = list.get(i);
+            if(null!=entity.getCreateUser()){
+                R<User> user = userClient.userInfoById(entity.getCreateUser());
+                if(null!=user.getData()){
+                    entity.setUserName(user.getData().getName());
+                }
+            }
+            if(null!=entity.getType()){
+                WarehouseOutType typeName = WarehouseOutType.getTypeName(entity.getType().intValue());
+                entity.setTypeName(typeName.getName());
+            }
+            result.add(entity);
+        }
+        return result;
+    }
+
 	public synchronized boolean updateStatus(SpWarehouseOutEntity warehouseOutEntity) {
 		warehouseOutEntity.setStatus(3);
 		Map<String,Object> params = new HashMap<>();

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java

@@ -59,6 +59,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.ws.WebServiceException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -539,9 +540,9 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl<WtSpBasicMapper, WtSpB
         String filename = file.getOriginalFilename();
         ExcelToolListener excelToolListener = new ExcelToolListener();
         if (org.springframework.util.StringUtils.isEmpty(filename)) {
-            throw new ExcelException("请上传文件!");
+            throw new ServiceException("请上传文件!");
         } else if (!org.springframework.util.StringUtils.endsWithIgnoreCase(filename, ".xls") && !org.springframework.util.StringUtils.endsWithIgnoreCase(filename, ".xlsx")) {
-            throw new ExcelException("请上传正确的excel文件!");
+            throw new ServiceException("请上传正确的excel文件!");
         } else {
             try {
                 InputStream inputStream = file.getInputStream();
@@ -551,6 +552,9 @@ public class WtSpBasicServiceImpl extends BaseServiceImpl<WtSpBasicMapper, WtSpB
             }
         }
         List entityList = excelToolListener.getDataList();
+        if (CollectionUtil.isEmpty(entityList)){
+            throw new ServiceException("请上传正确的excel文件!");
+        }
         List<WtSpBasicEntity> data = new ArrayList<>();
         data = JSONArray.parseArray(JSON.toJSONString(entityList), WtSpBasicEntity.class).stream()
                 .filter(entity -> Func.isNotEmpty(entity.getCode())).collect(Collectors.toList());

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java

@@ -209,7 +209,7 @@ public class ThreadTask {
 		diagnoseFaultReq.setFaultId(req.getFaultId());
 		diagnoseFaultReq.setConfidence(1.0);
 		diagnoseFaultReq.setLifeTime(24*3);//设置有效期3天
-		diagnoseFaultReq.setPriority(-1);
+		diagnoseFaultReq.setPriority(0);
 		diagnoseFaultReq.setTenantId(req.getStation());
 		diagnoseFaultReq.setCreateUser(ObjectUtil.isEmpty(AuthUtil.getUser()) ? "告警推送" : AuthUtil.getUser().getUserName());
 		faultAllReq.setManualData(diagnoseFaultReq);

hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java

@@ -588,7 +588,7 @@ public class FdpMonitorServiceImpl extends BaseServiceImpl<FdpMonitorMapper, Fdp
 
     @Override
     public R updateFaultState(DiagnoseFaultReq diagnoseFaultReq) {
-        diagnoseFaultReq.setPriority(2);
+        diagnoseFaultReq.setPriority(2);//一旦用户进行修改，优先级提为2
 //        /**获取故障对象**/
 //        LambdaQueryWrapper<FdpFaultEntity> wrapper = new LambdaQueryWrapper<>();
 //        wrapper.eq(FdpFaultEntity::getFdpId, diagnoseFaultReq.getFaultId()).last("limit 1");

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/Swagger2Config.java

@@ -20,8 +20,8 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  * @Serial 1.0
  * @Date 2023/4/13 13:40
  */
-@Configuration
-@EnableSwagger2
+//@Configuration
+//@EnableSwagger2
 public class Swagger2Config implements WebMvcConfigurer {
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/CentralMonitorController.java

@@ -48,6 +48,8 @@ public class CentralMonitorController extends BladeController {
 	 * @return
 	 */
 	@GetMapping("/selectCommunication/{page}/{size}")
+	@ApiOperation("查询通讯告警的最后一小时的运行数据")
+	@ApiOperationSupport(order = 2)
 	public R selectCommunication(@PathVariable Integer page,
 								 @PathVariable Integer size,
 								 String roleId,

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StAlamRecordController.java

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
-@Api(tags = "告警记录")
+@Api(value = "告警记录",tags = "告警记录")
 @RestController
 @RequestMapping("/stAlamRecord")
 public class StAlamRecordController {

hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/controller/StFocusPropertiesController.java

@@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
-@Api(tags = "重点关注属性")
+@Api(value = "重点关注属性",tags = "重点关注属性")
 @RestController
 @RequestMapping("/stFocusProperties")
 public class StFocusPropertiesController {

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

@@ -12,10 +12,12 @@ import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.CollectionUtil;
+import org.springblade.core.tool.utils.Func;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -113,10 +115,10 @@ public class ImsDutyClassServiceImpl extends BaseServiceImpl<ImsDutyClassMapper,
 	@Override
 	public List<DutyClassTypeTree> getDutyClassTree(Long deptId) {
 		List<DutyClassTypeTree> dutyClassTrees = this.baseMapper.getDutyClassTree(deptId);
-		dutyClassTrees.forEach(node -> {
-			node.setName(Optional.ofNullable(sysClient.getDeptName(node.getId())).map(R::getData).orElse(null));
-		});
-		return dutyClassTrees;
+		List<DutyClassTypeTree> result = dutyClassTrees.stream().peek(node -> node.setName(Optional.ofNullable(sysClient.getDeptName(node.getId())).map(R::getData).orElse(null)))
+				.filter(t -> Func.isNotEmpty(t.getName()))
+				.sorted(Comparator.comparing(DutyClassTypeTree::getName)).collect(Collectors.toList());
+		return result;
 	}
 
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/controller/MaintenanceController.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.operational.maintenance.controller;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.hnac.hzims.middle.process.to.ProcessWorkFlowResponse;
 import com.hnac.hzims.operational.maintenance.service.MaintenanceService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
@@ -25,6 +26,7 @@ import java.util.List;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/maintenance")
+@Api(value = "日常维护管理",tags = "日常维护管理")
 public class MaintenanceController {
 
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/scheduled/MaintenanceTaskRemindHandler.java

@@ -16,10 +16,7 @@ import com.xxl.job.core.log.XxlJobLogger;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.entity.User;
 import org.springblade.system.user.feign.IUserClient;
@@ -52,7 +49,7 @@ public class MaintenanceTaskRemindHandler {
         if(CollectionUtil.isNotEmpty(taskEntitySet)) {
             taskEntitySet.forEach(operMaintenanceTaskEntity -> {
                 OperMaintenanceTaskEntity taskEntity = taskService.getById(operMaintenanceTaskEntity.getId());
-                if(StringUtil.isBlank(taskEntity.getFlowTaskName())) {
+                if(ObjectUtil.isNotEmpty(taskEntity) || StringUtil.isBlank(taskEntity.getFlowTaskName())) {
                     redisTemplate.opsForZSet().remove(RedisKeyConstants.REMIND_TASK_END_LIST,operMaintenanceTaskEntity);
                 }
                 //如果任务仍在待执行则自动结束

hzims-service/operational/src/main/resources/db/4.0.0 .sql.1

@@ -30,4 +30,6 @@ CREATE TABLE `HZIMS_OPER_CONSTRUCTION`  (
     `UPDATE_USER` BIGINT(20) NULL DEFAULT NULL COMMENT '修改人',
     `UPDATE_TIME` DATETIME NULL DEFAULT NULL COMMENT '修改时间',
     PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = INNODB CHARACTER SET = UTF8MB4 COLLATE = UTF8MB4_GENERAL_CI ROW_FORMAT = DYNAMIC;
+) ENGINE = INNODB CHARACTER SET = UTF8MB4 COLLATE = UTF8MB4_GENERAL_CI ROW_FORMAT = DYNAMIC;
+
+alter table `hzims_oper_maintenance_library` add column `duty_class_tree` VARCHAR(100) NULL COMMENT '班次树，机构/班次类型/班次';