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

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

app/app-iot-server/src/main/java/com/yihu/ehr/iot/constant/ServiceApi.java

@@ -100,6 +100,7 @@ public class ServiceApi {
        public static final String DelQualityPlan = Base +"delQualityPlan";
        public static final String UpdQualityPlan = Base +"updQualityPlan";
        public static final String CompleteQualityPlan = Base +"completeQualityPlan";
        public static final String CompletePlanByPurchaseId = Base +"completePlanByPurchaseId";
        public static final String QueryQualityPlanPage = Base +"queryQualityPlanPage";
        public static final String FindById = Base +"findById";

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/device/IotDeviceQualityController.java

@@ -96,4 +96,18 @@ public class IotDeviceQualityController extends BaseController{
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceQuality.completePlanByPurchaseId)
    @ApiOperation(value = "完成质检计划(按采购id)", notes = "完成质检计划(按采购id)")
    public Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(@ApiParam(name = "actualTime", value = "完成时间", defaultValue = "")
                                                                              @RequestParam(value = "actualTime", required = true) String actualTime,
                                                                              @ApiParam(name = "purchaseId", value = "purchaseId")
                                                                              @RequestParam(value = "purchaseId", required = true) String purchaseId) {
        try {
            return iotDeviceQualityService.completePlanByPurchaseId(actualTime, purchaseId);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/device/IotDeviceQualityService.java

@@ -26,7 +26,7 @@ public class IotDeviceQualityService extends BaseService{
    public Envelop<IotDeviceQualityInspectionPlanVO> create(String jsonData) throws IOException {
        Map<String, Object> params = new HashMap<>();
        params.put("jsonData", jsonData);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Quality.CreateDevice, params);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Quality.AddQualityPlan, params);
        Envelop<IotDeviceQualityInspectionPlanVO> envelop = objectMapper.readValue(response.getBody(),Envelop.class);
        return envelop;
    }
@@ -96,4 +96,20 @@ public class IotDeviceQualityService extends BaseService{
        return envelop;
    }
    /**
     * 完成质检计划(按采购id)
     * @param actualTime
     * @param purchaseId
     * @return
     * @throws IOException
     */
    public Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(String actualTime,String purchaseId) throws IOException {
        Map<String, Object> params = new HashMap<>();
        params.put("actualTime", actualTime);
        params.put("purchaseId", purchaseId);
        HttpResponse response = HttpHelper.post(iotUrl + ServiceApi.Quality.CompletePlanByPurchaseId, params);
        Envelop<IotDeviceQualityInspectionPlanVO> envelop = objectMapper.readValue(response.getBody(),Envelop.class);
        return envelop;
    }
}

common/common-fegin/src/main/java/com/yihu/jw/fegin/fallbackfactory/iot/device/IotDeviceQualityFallbackFactory.java

@@ -71,6 +71,16 @@ public class IotDeviceQualityFallbackFactory implements FallbackFactory<IotDevic
                tracer.getCurrentSpan().logEvent("id:" + id);
                return null;
            }
            @Override
            public Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(
                    @RequestParam(value = "actualTime", required = true) String actualTime,
                    @RequestParam(value = "purchaseId", required = true) String purchaseId) {
                tracer.getCurrentSpan().logEvent("完成质检计划(按采购id)失败:原因:" + e.getMessage());
                tracer.getCurrentSpan().logEvent("actualTime:" + actualTime);
                tracer.getCurrentSpan().logEvent("purchaseId:" + purchaseId);
                return null;
            }
        };
    }

common/common-fegin/src/main/java/com/yihu/jw/fegin/iot/device/IotDeviceQualityFeign.java

@@ -22,13 +22,13 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface IotDeviceQualityFeign{
    @PostMapping(value = IotRequestMapping.DeviceQuality.addQualityPlan)
    public Envelop<IotDeviceQualityInspectionPlanVO> create(@RequestParam(value = "jsonData", required = true) String jsonData);
    Envelop<IotDeviceQualityInspectionPlanVO> create(@RequestParam(value = "jsonData", required = true) String jsonData);
    @GetMapping(value = IotRequestMapping.DeviceQuality.findById)
    public Envelop<IotDeviceQualityInspectionPlanVO> findByCode(@RequestParam(value = "id", required = true) String id);
    Envelop<IotDeviceQualityInspectionPlanVO> findByCode(@RequestParam(value = "id", required = true) String id);
    @GetMapping(value = IotRequestMapping.DeviceQuality.queryQualityPlanPage)
    public Envelop<IotDeviceQualityInspectionPlanVO> queryQualityPlanPage(
    Envelop<IotDeviceQualityInspectionPlanVO> queryQualityPlanPage(
           @RequestParam(value = "purcharseId", required = false) String purcharseId,
           @RequestParam(value = "orderNo", required = false) String orderNo,
           @RequestParam(value = "startTime", required = false) String startTime,
@@ -37,11 +37,16 @@ public interface IotDeviceQualityFeign{
           @RequestParam(value = "size", required = false) Integer size);
    @PostMapping(value = IotRequestMapping.DeviceQuality.delQualityPlan)
    public Envelop<IotDeviceQualityInspectionPlanVO> delQualityPlan(@RequestParam(value = "id", required = true) String id);
    Envelop<IotDeviceQualityInspectionPlanVO> delQualityPlan(@RequestParam(value = "id", required = true) String id);
    @PostMapping(value = IotRequestMapping.DeviceQuality.completeQualityPlan)
    public Envelop<IotDeviceQualityInspectionPlanVO> completeQualityPlan(
    Envelop<IotDeviceQualityInspectionPlanVO> completeQualityPlan(
        @RequestParam(value = "actualTime", required = true) String actualTime,
        @RequestParam(value = "id", required = true) String id);
    @PostMapping(value = IotRequestMapping.DeviceQuality.completePlanByPurchaseId)
    Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(
            @RequestParam(value = "actualTime", required = true) String actualTime,
            @RequestParam(value = "purchaseId", required = true) String purchaseId);
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/iot/IotRequestMapping.java

@@ -221,6 +221,7 @@ public class IotRequestMapping {
        public static final String delQualityPlan = "delQualityPlan";
        public static final String updQualityPlan = "updQualityPlan";
        public static final String completeQualityPlan = "completeQualityPlan";
        public static final String completePlanByPurchaseId = "completePlanByPurchaseId";
        public static final String queryQualityPlanPage = "queryQualityPlanPage";
        public static final String findById = "findById";

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/IotDeviceQualityInspectionPlanVO.java

@@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.Date;
/**
 * 设备质检计划表
@@ -35,12 +34,14 @@ public class IotDeviceQualityInspectionPlanVO extends BaseVO implements Serializ
    private String qualityLeaderPhone;
    @ApiModelProperty("计划质检时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date planTime;
    private String planTime;
    @ApiModelProperty("实际质检时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date actualTime;
    private String actualTime;
    @ApiModelProperty("质检状态(1未检，2已检)")
    private String status;
    @ApiModelProperty("质检状态(1未检，2已检)")
    private String statusName;
    public String getPurchaseId() {
        return purchaseId;
@@ -106,19 +107,19 @@ public class IotDeviceQualityInspectionPlanVO extends BaseVO implements Serializ
        this.qualityLeaderPhone = qualityLeaderPhone;
    }
    public Date getPlanTime() {
    public String getPlanTime() {
        return planTime;
    }
    public void setPlanTime(Date planTime) {
    public void setPlanTime(String planTime) {
        this.planTime = planTime;
    }
    public Date getActualTime() {
    public String getActualTime() {
        return actualTime;
    }
    public void setActualTime(Date actualTime) {
    public void setActualTime(String actualTime) {
        this.actualTime = actualTime;
    }
@@ -129,4 +130,12 @@ public class IotDeviceQualityInspectionPlanVO extends BaseVO implements Serializ
    public void setStatus(String status) {
        this.status = status;
    }
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceOrderController.java

@@ -209,7 +209,9 @@ public class IotDeviceOrderController extends EnvelopRestController{
        try {
            IotOrderPurchaseDO iotOrderPurchaseDO = iotDeviceOrderService.findPurchaseById(id);
            IotOrderPurchaseVO orderPurchaseVO = convertToModel(iotOrderPurchaseDO,IotOrderPurchaseVO.class);
            if(iotOrderPurchaseDO.getNextQualityTime()!=null){
                orderPurchaseVO.setNextQualityTime(DateUtil.dateToStrShort(iotOrderPurchaseDO.getNextQualityTime()));
            }
            return Envelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find,orderPurchaseVO);
        } catch (Exception e) {
            e.printStackTrace();

svr/svr-iot/src/main/java/com/yihu/iot/controller/device/IotDeviceQualityController.java

@@ -6,9 +6,11 @@ import com.yihu.jw.restmodel.common.Envelop;
import com.yihu.jw.restmodel.common.EnvelopRestController;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -27,8 +29,15 @@ public class IotDeviceQualityController extends EnvelopRestController{
    public Envelop<IotDeviceQualityInspectionPlanVO> create(@ApiParam(name = "jsonData", value = "", defaultValue = "")
                          @RequestParam String jsonData) {
        try {
            IotDeviceQualityInspectionPlanDO iotDeviceQualityInspectionPlan = toEntity(jsonData, IotDeviceQualityInspectionPlanDO.class);
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_create, iotDeviceQualityInspectionPlanService.create(iotDeviceQualityInspectionPlan));
            IotDeviceQualityInspectionPlanVO planVO = toEntity(jsonData, IotDeviceQualityInspectionPlanVO.class);
            IotDeviceQualityInspectionPlanDO planDO = convertToModel(planVO,IotDeviceQualityInspectionPlanDO.class);
            if(StringUtils.isNotBlank(planVO.getPlanTime())){
                planDO.setPlanTime(DateUtil.strToDate(planVO.getPlanTime()));
            }
            if(StringUtils.isNotBlank(planVO.getActualTime())){
                planDO.setActualTime(DateUtil.strToDate(planVO.getActualTime()));
            }
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_create, iotDeviceQualityInspectionPlanService.create(planDO));
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
@@ -42,7 +51,7 @@ public class IotDeviceQualityController extends EnvelopRestController{
    ) {
        try {
            IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanService.findById(id);
            IotDeviceQualityInspectionPlanVO planVO = convertToModel(planDO,IotDeviceQualityInspectionPlanVO.class);
            IotDeviceQualityInspectionPlanVO planVO = iotDeviceQualityInspectionPlanService.transforOne(planDO);
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_find, planVO);
        } catch (Exception e) {
            e.printStackTrace();
@@ -140,4 +149,19 @@ public class IotDeviceQualityController extends EnvelopRestController{
        }
    }
    @PostMapping(value = IotRequestMapping.DeviceQuality.completePlanByPurchaseId)
    @ApiOperation(value = "完成质检计划(按采购id)", notes = "完成质检计划(按采购id)")
    public Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(@ApiParam(name = "actualTime", value = "完成时间", defaultValue = "")
                                                                @RequestParam(value = "actualTime", required = true) String actualTime,
                                                                @ApiParam(name = "purchaseId", value = "purchaseId")
                                                                @RequestParam(value = "purchaseId", required = true) String purchaseId) {
        try {
            iotDeviceQualityInspectionPlanService.completePlanByPurchaseId(purchaseId,actualTime);
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_find);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError(e.getMessage());
        }
    }
}

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

@@ -148,10 +148,6 @@ public class IotProductController extends EnvelopRestController {
    public Envelop<IotProductVO> findByCode(@ApiParam(name = "id", value = "id")
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            String userAgent = request.getHeader("userAgent");
            if (StringUtils.isEmpty(userAgent)) {
                userAgent = request.getHeader("User-Agent");
            }
            IotProductVO vo = iotProductBaseInfoService.findProductById(id);
            return Envelop.getSuccess(IotRequestMapping.Common.message_success_find, vo);
        } catch (Exception e) {

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

@@ -16,12 +16,15 @@ public interface IotDeviceQualityInspectionPlanDao extends PagingAndSortingRepos
    @Query("from IotDeviceQualityInspectionPlanDO w where w.id =?1")
    IotDeviceQualityInspectionPlanDO findById(String id);
    @Query("from IotDeviceQualityInspectionPlanDO w where w.purchaseId =?1 and w.status=?2 and w.del=1")
    List<IotDeviceQualityInspectionPlanDO> findListByPurchaseId(String purchaseId,String qualityStatus);
    @Query("from IotDeviceQualityInspectionPlanDO w where w.purchaseId =?1 and w.status=?2 and w.del=1 ORDER BY w.planTime desc ")
    List<IotDeviceQualityInspectionPlanDO> findListByPurchaseId(String purchaseId,String status);
    @Query("from IotDeviceQualityInspectionPlanDO w where w.deviceId =?1")
    IotDeviceQualityInspectionPlanDO findByDeviceId(String deviceId);
    @Query(value = "SELECT a.* from iot_device_quality_inspection_plan a WHERE a.purchase_id = ?1 and a.del=1 ORDER BY a.status asc,a.plan_time desc limit 1",nativeQuery = true)
    IotDeviceQualityInspectionPlanDO findLastByPurchaseId(String purchaseId);
    @Query(value = "SELECT a.* from iot_device_quality_inspection_plan a WHERE a.purchase_id = ?1 and a.status=?2 and a.del=1 ORDER BY a.plan_time desc limit 1",nativeQuery = true)
    IotDeviceQualityInspectionPlanDO findLastByPurchaseId(String purchaseId,String status);
}

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

@@ -361,6 +361,29 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
        }
    }
    /**
     * 字典翻译
     * @param list
     */
    public List<IotOrderPurchaseVO> transForList(List<IotOrderPurchaseDO> list){
        List<IotOrderPurchaseVO> iotOrderPurchaseVOList = new ArrayList<>();
        if(list!=null&&list.size()>0){
            Map<String,String> qualityStatusMap = iotSystemDictService.findByDictName("QUALITY_STATUS");
            list.forEach(one->{
                IotOrderPurchaseVO orderPurchaseVO = convertToModel(one,IotOrderPurchaseVO.class);
                if(one.getNextQualityTime()!=null){
                    orderPurchaseVO.setNextQualityTime(DateUtil.dateToStrShort(one.getNextQualityTime()));
                }
                if(StringUtils.isNotBlank(one.getQualityStatus())){
                    orderPurchaseVO.setQualityStatusName(qualityStatusMap.get(one.getQualityStatus()));
                }
                iotOrderPurchaseVOList.add(orderPurchaseVO);
            });
        }
        return iotOrderPurchaseVOList;
    }
    /**
     * 按类型分页查找
     * @param page
@@ -399,8 +422,7 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
        long count = Long.valueOf(countList.get(0).get("count").toString());
        //DO转VO
        List<IotOrderPurchaseVO> iotOrderPurchaseVOList = convertToModels(list,new ArrayList<>(list.size()),IotOrderPurchaseVO.class);
        translateForList(iotOrderPurchaseVOList);
        List<IotOrderPurchaseVO> iotOrderPurchaseVOList = transForList(list);
        return Envelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,iotOrderPurchaseVOList, page, size,count);
    }

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

@@ -4,6 +4,7 @@ import com.yihu.base.mysql.query.BaseJpaService;
import com.yihu.iot.dao.device.IotDeviceOrderDao;
import com.yihu.iot.dao.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.iot.dao.device.IotOrderPurchaseDao;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.jw.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.iot.device.IotOrderPurchaseDO;
import com.yihu.jw.restmodel.common.Envelop;
@@ -38,6 +39,8 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
    private IotDeviceOrderDao iotDeviceOrderDao;
    @Autowired
    private JdbcTemplate jdbcTempalte;
    @Autowired
    private IotSystemDictService iotSystemDictService;
    /**
     * 新增
@@ -57,7 +60,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
        iotDeviceQualityInspectionPlan.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        iotDeviceQualityInspectionPlan.setDel(1);
        //更新采购清单的质检信息
        if(StringUtils.isNotBlank(purchaseDO.getQualityStatus())
        if(StringUtils.isBlank(purchaseDO.getQualityStatus())
                ||(iotDeviceQualityInspectionPlan.getPlanTime().getTime()-purchaseDO.getNextQualityTime().getTime())<0){
            purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
            purchaseDO.setNextQualityTime(iotDeviceQualityInspectionPlan.getPlanTime());
@@ -89,25 +92,108 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
    /**
     * 完成质检计划
     * @param id
     * @param purchaseId
     */
    public void completePlan(String id,String time){
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findById(id);
        planDO.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
        planDO.setActualTime(DateUtil.strToDate(time));
        //更新采购清单的质检信息
    public void completePlanByPurchaseId(String purchaseId,String time){
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findLastByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        if(planDO!=null){
            planDO.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            planDO.setActualTime(DateUtil.strToDate(time));
            iotDeviceQualityInspectionPlanDao.save(planDO);
            updatePurchase(purchaseId);
        }
    }
    /**
     * 更新采购清单的质检信息
     * @param purchaseId
     */
    private void updatePurchase(String purchaseId){
        List<IotDeviceQualityInspectionPlanDO> list = iotDeviceQualityInspectionPlanDao.
                findListByPurchaseId(planDO.getPurchaseId(),IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
                findListByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
        if(list==null||list.size()==0){
            IotDeviceQualityInspectionPlanDO last = iotDeviceQualityInspectionPlanDao.findLastByPurchaseId(planDO.getPurchaseId());
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(planDO.getPurchaseId());
            IotDeviceQualityInspectionPlanDO last = iotDeviceQualityInspectionPlanDao.findLastByPurchaseId(purchaseId,IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(purchaseId);
            purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            purchaseDO.setNextQualityTime(last.getPlanTime());
            purchaseDO.setQualityLeader(last.getQualityLeader());
            iotOrderPurchaseDao.save(purchaseDO);
        }else {
            IotDeviceQualityInspectionPlanDO last = list.get(0);
            IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(purchaseId);
            purchaseDO.setQualityStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.create.getValue());
            purchaseDO.setNextQualityTime(last.getPlanTime());
            purchaseDO.setQualityLeader(last.getQualityLeader());
            iotOrderPurchaseDao.save(purchaseDO);
        }
    }
        iotDeviceQualityInspectionPlanDao.save(planDO);
    /**
     * 完成质检计划
     * @param id 质检id
     */
    public void completePlan(String id,String time){
        IotDeviceQualityInspectionPlanDO planDO = iotDeviceQualityInspectionPlanDao.findById(id);
        if(planDO!=null){
            planDO.setStatus(IotDeviceQualityInspectionPlanDO.QualityPlanStatus.complete.getValue());
            planDO.setActualTime(DateUtil.strToDate(time));
            iotDeviceQualityInspectionPlanDao.save(planDO);
            updatePurchase(planDO.getPurchaseId());
        }
    }
    /**
     * 字典翻译
     * @param planDO
     * @return
     */
    public IotDeviceQualityInspectionPlanVO transforOne(IotDeviceQualityInspectionPlanDO planDO){
        if(planDO==null){
            return null;
        }
        IotDeviceQualityInspectionPlanVO planVO = convertToModel(planDO,IotDeviceQualityInspectionPlanVO.class);
        if(planDO.getPlanTime()!=null){
            planVO.setPlanTime(DateUtil.dateToStrShort(planDO.getPlanTime()));
        }
        if(planDO.getActualTime()!=null){
            planVO.setActualTime(DateUtil.dateToStrShort(planDO.getActualTime()));
        }
        if(StringUtils.isNotBlank(planDO.getStatus())){
            Map<String,String> qualityStatusMap = iotSystemDictService.findByDictName("QUALITY_STATUS");
            planVO.setStatusName(qualityStatusMap.get(planDO.getStatus()));
        }
        return planVO;
    }
    /**
     * 字典翻译
     * @param list
     * @return
     */
    public List<IotDeviceQualityInspectionPlanVO> transforList(List<IotDeviceQualityInspectionPlanDO> list){
        List<IotDeviceQualityInspectionPlanVO> qualityInspectionPlanVOList = new ArrayList<>();
        if(list!=null&&list.size()>0){
            Map<String,String> qualityStatusMap = iotSystemDictService.findByDictName("QUALITY_STATUS");
            list.forEach(planDO->{
                IotDeviceQualityInspectionPlanVO planVO = convertToModel(planDO,IotDeviceQualityInspectionPlanVO.class);
                if(planDO.getPlanTime()!=null){
                    planVO.setPlanTime(DateUtil.dateToStrShort(planDO.getPlanTime()));
                }
                if(planDO.getActualTime()!=null){
                    planVO.setActualTime(DateUtil.dateToStrShort(planDO.getActualTime()));
                }
                if(StringUtils.isNotBlank(planDO.getStatus())){
                    planVO.setStatusName(qualityStatusMap.get(planDO.getStatus()));
                }
                qualityInspectionPlanVOList.add(planVO);
            });
        }
        return qualityInspectionPlanVOList;
    }
    /**
@@ -149,7 +235,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
        long count = Long.valueOf(countList.get(0).get("count").toString());
        //DO转VO
        List<IotDeviceQualityInspectionPlanVO> qualityInspectionPlanVOList = convertToModels(list,new ArrayList<>(list.size()),IotDeviceQualityInspectionPlanVO.class);
        List<IotDeviceQualityInspectionPlanVO> qualityInspectionPlanVOList = transforList(list);
        return Envelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,qualityInspectionPlanVOList, page, size,count);
    }

web-gateway/src/main/java/com/yihu/jw/controller/iot/device/IotDeviceQualityController.java

@@ -72,4 +72,13 @@ public class IotDeviceQualityController extends EnvelopRestController{
        return iotDeviceQualityFeign.completeQualityPlan(actualTime,id);
    }
    @PostMapping(value = IotRequestMapping.DeviceQuality.completePlanByPurchaseId)
    @ApiOperation(value = "完成质检计划(按采购id)", notes = "完成质检计划(按采购id)")
    public Envelop<IotDeviceQualityInspectionPlanVO> completePlanByPurchaseId(@ApiParam(name = "actualTime", value = "完成时间", defaultValue = "")
                                                                              @RequestParam(value = "actualTime", required = true) String actualTime,
                                                                              @ApiParam(name = "purchaseId", value = "purchaseId")
                                                                              @RequestParam(value = "purchaseId", required = true) String purchaseId) {
        return iotDeviceQualityFeign.completePlanByPurchaseId(actualTime,purchaseId);
    }
}