Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/FetchingDataDto/WarehouseDevInfoDto.java

@@ -67,4 +67,7 @@ public class WarehouseDevInfoDto {
      *
      */
     private Date updateTime;
+
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/dto/WarehouseDevDto.java

@@ -70,4 +70,7 @@ public class WarehouseDevDto {
     private String orgName;
     private String warehouseName;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/query/QueryWarehouseDevReq.java

@@ -67,4 +67,7 @@ public class QueryWarehouseDevReq {
 
     private Date updateTime;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-api/src/main/java/com/junmp/jyzb/api/bean/req/UpdateWarehouseDevReq.java

@@ -79,4 +79,7 @@ public class UpdateWarehouseDevReq {
     //是否暂存（true表示暂存不会下发到本地主机，如果为空或者是为false则表示直接下发通知到本地主机）
     private Boolean flag;
 
+    //设备类型（0除湿机，1温湿度计）
+    private Integer devType;
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/Repository/SupplierRepository.java

+package com.junmp.jyzb.Repository;
+
+import com.junmp.jyzb.entity.Supplier;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+
+public interface SupplierRepository extends ElasticsearchRepository<Supplier, Long> {
+}

jyzb-biz/src/main/java/com/junmp/jyzb/entity/WarehouseDev.java

@@ -98,6 +98,10 @@ public class WarehouseDev implements Serializable {
     @TableField(value = "update_time")
     private Date updateTime;
 
+    //设备类型（0，除湿机，1温度计）
+    @TableField(value = "dev_type")
+    private Integer devType;
+
     @TableField(exist = false)
     private String orgName;
 

jyzb-biz/src/main/java/com/junmp/jyzb/mapper/InventorySummaryMapper.java

@@ -96,4 +96,10 @@ public interface InventorySummaryMapper  extends BaseMapper<InventorySummary> {
     void useViewOrgIdInLevel(@Param("sql") String sql,@Param("orgId") Long orgId);
 
     List<Long> selectOrgIds(@Param("orgId") Long orgId);
+
+    void setWarrantyInventoryAction();
+
+    void setDestoryGroupAction();
+
+    void setWarrantyGroupAction();
 }
\ No newline at end of file

jyzb-biz/src/main/java/com/junmp/jyzb/service/InventorySummaryService.java

@@ -48,4 +48,10 @@ public interface InventorySummaryService extends IService<InventorySummary> {
     PageResult<InventorySummary> GetEquipmentSummary(InventorySumReq req);
 
     List<InventorySummary> GetEquipmentSummaryDetail(InventorySumReq req);
+
+    void setWarrantyInventoryAction();
+
+    void setDestoryGroupAction();
+
+    void setWarrantyGroupAction();
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/PublicService.java

@@ -16,4 +16,6 @@ public interface PublicService {
     List<SimpleDictVo> getAllDictItem();
 
     boolean updateMessage(MessageReq req);
+
+
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/SupplierService.java

@@ -11,6 +11,9 @@ import com.junmp.v2.db.api.page.PageResult;
 import java.util.List;
 
 public interface SupplierService extends IService<Supplier> {
+
+    Object addEs();
+
     /**
      * 新增
      *

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentSizeServiceImpl.java

@@ -141,6 +141,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         mqDto.setMessage("Adding sizeInfo");
         MQ.sendToExchange(exchangeName,"org",mqDto);
 
+        //添加es
+        sizeRepository.save(size);
         return sizeID+"||"+code;
     }
 
@@ -186,6 +188,8 @@ public class EquipmentSizeServiceImpl extends ServiceImpl<EquipmentSizeMapper, E
         mqDto.setMessage("Updating sizeInfo");
         MQ.sendToExchange(exchangeName,"org",mqDto);
 
+        //添加es
+        sizeRepository.save(size);
         return this.updateById(size);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/EquipmentTypeServiceImpl.java

@@ -151,12 +151,14 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             mqDto.setType(2);
             mqDto.setMessage("Adding typeInfo");
             MQ.sendToExchange(exchangeName,"org",mqDto);
-
+            //往es中添加数据
+            typeRepository.save(type);
             return  String.valueOf(newcode);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);
             throw new JYZBAppException(EquipmentExceptionEnum.SUPPLIER_NOT_EXIST, msg);
         }
+
     }
 
 
@@ -256,6 +258,8 @@ public class EquipmentTypeServiceImpl extends ServiceImpl<EquipmentTypeMapper, E
             mqDto.setType(2);
             mqDto.setMessage("Updating typeInfo");
             MQ.sendToExchange(exchangeName,"org",mqDto);
+            //往es中添加数据
+            typeRepository.save(type);
             return this.updateById(type);
         } else {
             String msg="以下供应商不存在：" +String.join(",", chekResult);

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/InventorySummaryServiceImpl.java

@@ -176,6 +176,8 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
         return inventorySummaryMapper.GetEquipmentSummaryDetail(req);
     }
 
+
+
     @Override
     public List<InventorySummary> getEquipmentInfoList(InventorySumReq req) {
         //当没有参数传递的时候默认查询全部，但是如果传递了条件，根据条件查询并且如果是根据id进行查询，则需要判断该id是否存在
@@ -517,4 +519,24 @@ public class InventorySummaryServiceImpl  extends ServiceImpl<InventorySummaryMa
 
         return wrapper;
     }
+    //执行过质保期装备存储过程
+    @Override
+    public void setWarrantyInventoryAction() {
+        inventorySummaryMapper.setWarrantyInventoryAction();
+        System.out.println("111 = " + 111);
+    }
+    //执行过质保期装备存储过程
+    @Override
+    public void setDestoryGroupAction() {
+        inventorySummaryMapper.setDestoryGroupAction();
+        System.out.println("111 = " + 222);
+
+    }
+    //执行过质保期装备存储过程
+    @Override
+    public void setWarrantyGroupAction() {
+        inventorySummaryMapper.setWarrantyGroupAction();
+        System.out.println("111 = " + 333);
+
+    }
 }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -590,9 +590,9 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
     }
 
     private BusForm setState1(String orderType,Long orgId,String bussinessCode){
-        BusForm busform = busFormService.getOne(new LambdaQueryWrapper<BusForm>()
+        BusForm busform = busFormService.list(new LambdaQueryWrapper<BusForm>()
                 .eq(BusForm::getOrgId, orgId)
-                .in(BusForm::getBussinessCode, bussinessCode));
+                .in(BusForm::getBussinessCode, bussinessCode)).get(0);
         busform.setOrderCurrentState(busform.getOrderLastState());
         if (orderType.equals("in")){
             switch (busform.getOrderCurrentState()){
@@ -1171,6 +1171,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                             LogDetailReq logDetailReq = new LogDetailReq();
                             BeanPlusUtil.copyProperties(inv,logDetailReq);
                             logDetailReq.setOutInState(req.getOrderType());
+                            logDetailReq.setCreateTime(DateTimeUtil.getCurrentDateTime());
                             if (CollectionUtil.isEmpty(logDetailList)) {
                                 lsReq.setLogList(new ArrayList<>());
                                 logDetailList = lsReq.getLogList();
@@ -1365,7 +1366,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                 for (OrderLogReq ol: ls.getOrderLogList()) {
                     OrderLog orderLog = new OrderLog();
                     BeanPlusUtil.copyProperties(ol,orderLog);
-
+                    orderLog.setCreateTime(DateTimeUtil.getCurrentDateTime());
                     orderLogList.add(orderLog);
                 }
             }
@@ -1375,6 +1376,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     LogDetail logDetail = new LogDetail();
                     BeanPlusUtil.copyProperties(ld,logDetail);
                     logDetail.setSummaryId(logSummary.getId());
+                    logDetail.setCreateTime(DateTimeUtil.getCurrentDateTime());
                     logDetailList.add(logDetail);
                 }
             }

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/PubOrgServiceImpl.java

@@ -836,6 +836,8 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
         pubOrg.setCreateTime(DateTimeUtil.getCurrentDateTime());
         pubOrg.setIsMap("0");
         save(pubOrg);
+        //添加es
+        pubOrgRepository.save(pubOrg);
         return pubOrg.getOrgId();
     }
 
@@ -848,6 +850,8 @@ public class PubOrgServiceImpl extends ServiceImpl<PubOrgMapper, PubOrg>  implem
 //        }
         PubOrg pubOrg = new PubOrg();
         BeanPlusUtil.copyProperties(req,pubOrg);
+        //添加es
+        pubOrgRepository.save(pubOrg);
         return updateById(pubOrg);
     }
 

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/SupplierServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.junmp.jyzb.Repository.SupplierRepository;
 import com.junmp.jyzb.api.bean.dto.FetchingDataDto.SupplierInfoDto;
 import com.junmp.jyzb.api.bean.dto.MQDto;
 import com.junmp.jyzb.api.bean.dto.SupplierDto;
@@ -42,6 +43,16 @@ public class SupplierServiceImpl extends ServiceImpl<SupplierMapper, Supplier> i
 
     @Resource
     private SupplierMapper supplierMapper;
+    
+    @Resource
+    private SupplierRepository supplierRepository;
+
+    @Override
+    public Object addEs() {
+        QuerySupplierReq req = new QuerySupplierReq();
+
+        return null;
+    }
 
     @Override
     public String AddSupplier(UpdateSupplierReq req) {

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/VieWarrantyGroupServiceImpl.java

@@ -36,7 +36,7 @@ public class VieWarrantyGroupServiceImpl extends ServiceImpl<VieWarrantyGroupMap
     private VieDestoryGroupServiceImpl VieDestoryGroupService;
     @Override
     public PageResult<WarrantyDataDto> WarrantyData(WarrantyReq req) {
-        if(req.getWarrantyType().equals(0)||req.getWarrantyType().equals(1))
+        if(req.getWarrantyType().equals("0")||req.getWarrantyType().equals("1"))
         {
             LambdaQueryWrapper<VieWarrantyGroup> wrapper = createWrapper(req);
             Page<VieWarrantyGroup> page = page(PageFactory.getDefaultPage(req.getPageNo(), req.getPageSize()), wrapper);

jyzb-biz/src/main/java/com/junmp/jyzb/task/DestoryGroupAction.java

+package com.junmp.jyzb.task;
+
+import com.junmp.jyzb.service.InventorySummaryService;
+import com.junmp.jyzb.service.PublicService;
+import com.junmp.v2.job.api.JobAction;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Component
+public class DestoryGroupAction implements JobAction {
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+    @Override
+    public void action() {
+        inventorySummaryService.setDestoryGroupAction();
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/task/WarrantyGroupAction.java

+package com.junmp.jyzb.task;
+
+import com.junmp.jyzb.service.InventorySummaryService;
+import com.junmp.jyzb.service.PublicService;
+import com.junmp.v2.job.api.JobAction;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Component
+
+public class WarrantyGroupAction implements JobAction{
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+    @Override
+    public void action() {
+        inventorySummaryService.setWarrantyGroupAction();
+    }
+}

jyzb-biz/src/main/java/com/junmp/jyzb/task/WarrantyInventoryAction.java

+package com.junmp.jyzb.task;
+
+import com.junmp.jyzb.service.InventorySummaryService;
+import com.junmp.jyzb.service.PublicService;
+import com.junmp.v2.job.api.JobAction;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Component
+
+public class WarrantyInventoryAction implements JobAction{
+
+    @Resource
+    private InventorySummaryService inventorySummaryService;
+    @Override
+    public void action() {
+        inventorySummaryService.setWarrantyInventoryAction();
+    }
+}

jyzb-biz/src/main/resources/mapper/InventorySummaryMapper.xml

@@ -87,7 +87,21 @@
                 END
         WHERE add_price IS NULL OR add_num IS NULL;
     </update>
+    <insert id="setWarrantyInventoryAction" statementType="CALLABLE">
 
+        {CALL Insert_into_base_warranty_inventory()}
+
+    </insert>
+    <insert id="setDestoryGroupAction" statementType="CALLABLE">
+
+        {CALL Insert_into_view_destory_group()}
+
+    </insert>
+    <insert id="setWarrantyGroupAction" statementType="CALLABLE">
+
+        {CALL Insert_into_view_warranty_group()}
+
+    </insert>
 
     <insert id="getSumByCabinet">
         INSERT INTO base_inventory_summary (id,org_id_int,org_name,type_id, type_name,size_id,size_name,location_id,location_name,

jyzb-boot/src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ knife4j:
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.128:3306/db_jyzb?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
+    url: jdbc:mysql://192.168.1.128:3306/db_jyzb_test?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=CTT&nullCatalogMeansCurrent=true
     username: root
     password: 123456
 

jyzb-process/src/main/java/com/junmp/junmpProcess/service/impl/FlowTaskServiceImpl.java

@@ -260,12 +260,11 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             map.put(PROCESS_STATUS, BUSINESS_STATUS_3);
             taskService.setVariableLocal(taskId,"taskStatusWrapper", TASK_STATUS_2);//设置节点中的当前操作
             runtimeService.setVariables(task.getProcessInstanceId(), map);
-            if (StringUtils.isNotBlank(comments)) {
-                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
-            }else {
+            if (StringUtils.isBlank(comments)) {
                 //默认拒绝
-                taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", "拒绝");
+                comments="拒绝";
             }
+            taskService.addComment(task.getId(), task.getProcessInstanceId(), "opinion", comments);
             if (attachments != null && attachments.size() > 0) {
                 for (AttachmentDTO attachment : attachments) {
                     taskService.createAttachment("option", taskId, task.getProcessInstanceId(), attachment.getName(), attachment.getName(), attachment.getUrl());
@@ -305,7 +304,7 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
             sendReq.setMsgTitle("您的审批被驳回");
             sendReq.setBizType("refuse/"+Types);
             sendReq.setBizId(Long.valueOf(task.getProcessInstanceId()));
-            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+handleDataDTO.getComments());
+            sendReq.setMsgContent("您提交的审批【"+mainProcess.getName()+"】被驳回，原因:"+comments);
             sendReq.setPriority("0");
             sendReq.setSendTime(DateTime.now());
             messageApi.sendMessage(sendReq);