Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

svr/svr-iot/src/main/java/com/yihu/iot/controller/product/IotProductController.java

@@ -56,10 +56,10 @@ public class IotProductController extends EnvelopRestController {
            if(size == null){
                size = 10;
            }
            String filters = "";
            String semicolon = "del=1;";
            String filters = "del=1;";
            String semicolon = "";
            if(StringUtils.isNotBlank(name)){
                filters = "name?"+name+" g1;registerCertificate?"+name+" g1";
                filters += "name?"+name+" g1;registerCertificate?"+name+" g1";
                semicolon = ";";
            }
            if(StringUtils.isNotBlank(companyId)){

svr/svr-iot/src/main/java/com/yihu/iot/dao/device/IotDeviceDao.java

@@ -2,9 +2,11 @@ package com.yihu.iot.dao.device;
import com.yihu.jw.iot.device.IotDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
/**
@@ -21,6 +23,10 @@ public interface IotDeviceDao extends PagingAndSortingRepository<IotDeviceDO, St
    @Query("select count(*) from IotDeviceDO w where w.purchaseId =?1 and w.del=1")
    int countByPurchaseId(String purchaseId);
    @Modifying
    @Query("update IotDeviceDO w set w.nextQualityTime=?1 where w.purchaseId =?2 and w.del=1")
    int updateQualityTime(Date nextQualityTime, String purchaseId);
    @Query("select count(*) from IotDeviceDO w where w.orderId =?1 and w.del=1")
    int countByOrderId(String orderId);

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceQualityInspectionPlanService.java

@@ -1,6 +1,7 @@
package com.yihu.iot.service.device;
import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDeviceDao;
import com.yihu.iot.dao.device.IotDeviceOrderDao;
import com.yihu.iot.dao.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.iot.dao.device.IotOrderPurchaseDao;
@@ -43,12 +44,15 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
    private JdbcTemplate jdbcTempalte;
    @Autowired
    private IotSystemDictService iotSystemDictService;
    @Autowired
    private IotDeviceDao iotDeviceDao;
    /**
     * 新增
     * @param iotDeviceQualityInspectionPlan
     * @return
     */
    @Transactional
    public IotDeviceQualityInspectionPlanDO create(IotDeviceQualityInspectionPlanDO iotDeviceQualityInspectionPlan) {
        IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(iotDeviceQualityInspectionPlan.getPurchaseId());
@@ -68,6 +72,8 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
            purchaseDO.setNextQualityTime(iotDeviceQualityInspectionPlan.getPlanTime());
            purchaseDO.setQualityLeader(iotDeviceQualityInspectionPlan.getQualityLeader());
            iotOrderPurchaseDao.save(purchaseDO);
            iotDeviceDao.updateQualityTime(iotDeviceQualityInspectionPlan.getPlanTime(),purchaseDO.getId());
        }
        return iotDeviceQualityInspectionPlanDao.save(iotDeviceQualityInspectionPlan);
@@ -120,13 +126,14 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
        if(list==null||list.size()==0){
            IotDeviceQualityInspectionPlanDO last = iotDeviceQualityInspectionPlanDao.findLastByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(purchaseId);
            purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            if(last==null){
                purchaseDO.setNextQualityTime(null);
                purchaseDO.setQualityLeader(null);
                purchaseDO.setQualityStatus(null);
            }else{
                purchaseDO.setNextQualityTime(last.getPlanTime());
                purchaseDO.setQualityLeader(last.getQualityLeader());
                purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            }
            iotOrderPurchaseDao.save(purchaseDO);
        }else {

svr/svr-iot/src/main/java/com/yihu/iot/service/device/IotDeviceService.java

@@ -63,6 +63,7 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
     * @param iotDevice
     * @return
     */
    @Transactional
    public IotDeviceDO create(IotDeviceDO iotDevice) {
        if(iotDevice.getPurchaseId()!=null){
@@ -188,8 +189,8 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
     * @return
     */
    public Envelop<IotDeviceVO> queryPage(String sn,String hospital,String orderId,String purcharseId,Integer page,Integer size) throws Exception{
        String filters = "";
        String semicolon = "del=1;";
        String filters = "del=1;";
        String semicolon = "";
        if(StringUtils.isNotBlank(orderId)){
            filters += semicolon +"orderId="+orderId;
            semicolon = ";";
@@ -406,6 +407,11 @@ public class IotDeviceService extends BaseJpaService<IotDeviceDO,IotDeviceDao> {
            IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findByDeviceId(iotDeviceVO.getId());
            if(planDO!=null){
                iotDeviceVO.setQualityStatus(qualityStatusMap.get(planDO.getStatus()));//质检状态
            }else if(StringUtils.isNotBlank(iotDeviceVO.getPurchaseId())){
                IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(iotDeviceVO.getPurchaseId());
                if(purchaseDO!=null&&StringUtils.isNotBlank(purchaseDO.getQualityStatus())){
                    iotDeviceVO.setQualityStatus(qualityStatusMap.get(purchaseDO.getQualityStatus()));//质检状态
                }
            }
            //数据来源
            if(StringUtils.isNotBlank(iotDeviceVO.getPurchaseId())){