Merge branch 'sudve' of suhaiwen/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/iot/dict/IotSystemDictDO.java

@@ -32,6 +32,10 @@ public class IotSystemDictDO extends UuidIdentityEntityWithOperator implements S
    private Integer del;//删除标志
    @Column(name = "parent_code")
    private String parentCode;
    @Column(name = "status")
    private Integer status;
    @Column(name = "time")
    private String time;
    @Transient
    private String parentName;//父类字典名称
@@ -99,6 +103,22 @@ public class IotSystemDictDO extends UuidIdentityEntityWithOperator implements S
        this.parentCode = parentCode;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public String getTime() {
        return time;
    }
    public void setTime(String time) {
        this.time = time;
    }
    @Transient
    public String getParentName() {
        return parentName;

common/common-entity/src/main/java/com/yihu/jw/entity/iot/message/IotMessageDO.java

@@ -22,8 +22,8 @@ public class IotMessageDO extends UuidIdentityEntityWithOperator implements Seri
    private String content;//消息内容
    @Column(name = "type")
    private String type;//消息类型 1：SIM卡续费通知 2：库存预警提醒 3：定期检修提醒 4：设备质检提醒',
    @Column(name = "read")
    private String read;//消息状态，1：已读  0：未读',
    @Column(name = "read_msg")
    private String readMsg;//消息状态，1：已读  0：未读',
    @Column(name = "del")
    private String del;//删除标志  1：删除  0：不删除',
    @Column(name = "relation_code")
@@ -54,12 +54,12 @@ public class IotMessageDO extends UuidIdentityEntityWithOperator implements Seri
        this.type = type;
    }
    public String getRead() {
        return read;
    public String getReadMsg() {
        return readMsg;
    }
    public void setRead(String read) {
        this.read = read;
    public void setReadMsg(String readMsg) {
        this.readMsg = readMsg;
    }
    public String getDel() {

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

@@ -245,6 +245,7 @@ public class IotRequestMapping {
        public static final String delPurchase = "delPurchase";
        public static final String updOrder = "updOrder";
        public static final String createOrder = "createOrder";
        public static final String findAllOrderNo = "findAllOrderNo";
        public static final String findPurcharsePage = "findPurcharsePage";
        public static final String findPurcharseById = "findPurcharseById";

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

@@ -6,6 +6,7 @@ import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import javax.persistence.Column;
import java.io.Serializable;
/**
@@ -43,6 +44,13 @@ public class IotDeviceQualityInspectionPlanVO extends BaseVO implements Serializ
    @ApiModelProperty("质检状态(1未检，2已检)")
    private String statusName;
    //新增字段
    @ApiModelProperty("质检图像")
    private String img;//质检图像
    @ApiModelProperty("质检小结")
    private String summary;//质检小结
    public String getPurchaseId() {
        return purchaseId;
    }
@@ -138,4 +146,20 @@ public class IotDeviceQualityInspectionPlanVO extends BaseVO implements Serializ
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
    public String getImg() {
        return img;
    }
    public void setImg(String img) {
        this.img = img;
    }
    public String getSummary() {
        return summary;
    }
    public void setSummary(String summary) {
        this.summary = summary;
    }
}

svr/svr-iot-job/src/main/java/com/yihu/jw/service/channel/DeviceQualityPlanService.java

@@ -1,8 +1,10 @@
package com.yihu.jw.service.channel;
import com.yihu.iot.dao.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.dao.message.IotMessageDao;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.util.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,18 +30,25 @@ public class DeviceQualityPlanService {
    @Autowired
    private IotDeviceQualityInspectionPlanDao iotDeviceQualityInspectionPlanDao;
    @Autowired
    private IotSystemDictDao iotSystemDictDao;
    public void autoPush() {
        IotSystemDictDO qualityRemind = iotSystemDictDao.findByDictName("DEVICE_QUALITY_REMIND").get(0);
        int time = Integer.parseInt(qualityRemind.getTime());
        List<IotDeviceQualityInspectionPlanDO> listAll = iotDeviceQualityInspectionPlanDao.findListAll();
        listAll.forEach(one->{
            Date remindTime = one.getRemindTime();
            Date planTime = one.getPlanTime();
            Date remindTime = DateUtil.getPreDays(planTime, -time);
            String system = DateUtil.dateToStrShort(DateUtil.getNowDate());
            String remind = DateUtil.dateToStrShort(remindTime);
            if (system.equalsIgnoreCase(remind)){
                IotMessageDO iotMessageDO = new IotMessageDO();
                iotMessageDO.setTitle("设备质检提醒");
                iotMessageDO.setContent("订单："+one.getPurchaseId()+".将于"+remind+"，进行质检，请及时维护");
                iotMessageDO.setRead("0");
                iotMessageDO.setContent("订单："+one.getOrderNo()+"将于："+remind+"进行质检，请及时维护");
                iotMessageDO.setReadMsg("0");
                iotMessageDO.setDel("0");
                iotMessageDO.setTitle("4");
                iotMessageDao.save(iotMessageDO);

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

@@ -74,7 +74,7 @@ public class IotDeviceController extends EnvelopRestEndpoint {
        try {
            Integer re = iotDeviceService.delDevice(id);
            if(re==1){
                return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_find);
                return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_delete);
            }else {
                return MixEnvelop.getError(IotRequestMapping.Device.del_message_fail);
            }

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

@@ -219,4 +219,16 @@ public class IotDeviceOrderController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = IotRequestMapping.DeviceOrder.findAllOrderNo)
    @ApiOperation(value = "查找所有订单编码", notes = "查找所有订单编码")
    public MixEnvelop<IotOrderPurchaseVO, IotOrderPurchaseVO> findAllOrderNo() {
        try {
            List<String> list = iotDeviceOrderService.findAllOrderNo();
            return MixEnvelop.getSuccess(IotRequestMapping.DeviceOrder.message_success_find,list);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

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

@@ -47,8 +47,8 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.DeviceQuality.findById)
    @ApiOperation(value = "根据code查找设备质检", notes = "根据code查找设备质检")
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO> findByCode(@ApiParam(name = "id", value = "id")
    @ApiOperation(value = "根据ID查找设备质检", notes = "根据ID查找设备质检")
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO> findByCode(@ApiParam(name = "id", value = "质检ID")
                              @RequestParam(value = "id", required = true) String id
    ) {
        try {
@@ -65,8 +65,8 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
    @GetMapping(value = IotRequestMapping.DeviceQuality.queryQualityPlanPage)
    @ApiOperation(value = "分页获取设备质检计划", notes = "分页获取设备质检计划")
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO> findProductPageByCompanyId(
            @ApiParam(name = "purcharseId", value = "采购id", defaultValue = "")
            @RequestParam(value = "purcharseId", required = false) String purcharseId,
            @ApiParam(name = "status", value = "质检状态", defaultValue = "")
            @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "orderNo", value = "订单编号", defaultValue = "")
            @RequestParam(value = "orderNo", required = false) String orderNo,
            @ApiParam(name = "startTime", value = "开始时间", defaultValue = "")
@@ -116,7 +116,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
//
//            return Envelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,voList, page, size,count);
            return iotDeviceQualityInspectionPlanService.queryPage(purcharseId, orderNo, startTime, endTime, page, size);
            return iotDeviceQualityInspectionPlanService.queryPage(status, orderNo, startTime, endTime, page, size);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
@@ -129,7 +129,7 @@ public class IotDeviceQualityController extends EnvelopRestEndpoint {
                                            @RequestParam(value = "id", required = true) String id) {
        try {
            iotDeviceQualityInspectionPlanService.delPlan(id);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find);
            return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_delete);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());

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

@@ -117,7 +117,7 @@ public class IotDeviceSimController extends EnvelopRestEndpoint {
    }
    @GetMapping(value = IotRequestMapping.DeviceSim.remind)
    @ApiOperation(value = "分页查询所有SIM卡信息",notes = "分页查询所有SIM卡信息")
    @ApiOperation(value = "SIM卡提醒设置",notes = "SIM卡提醒设置")
    public MixEnvelop<IotDeviceSimDO,IotDeviceSimDO> remind(@ApiParam(name = "time", value = "提醒时间", defaultValue = "")
                                                                @RequestParam(value = "time", required = false) String time,
                                                                @ApiParam(name = "money", value = "提醒金额", defaultValue = "")

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

@@ -31,6 +31,6 @@ public interface IotDeviceQualityInspectionPlanDao extends PagingAndSortingRepos
    @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 asc limit 1",nativeQuery = true)
    IotDeviceQualityInspectionPlanDO findFirstByPurchaseId(String purchaseId,String status);
    @Query("from IotDeviceQualityInspectionPlanDO w where  w.status=1 and w.del=1 ORDER BY w.planTime desc")
    @Query("from IotDeviceQualityInspectionPlanDO w where   w.del=1 ORDER BY w.planTime desc")
    List<IotDeviceQualityInspectionPlanDO> findListAll();
}

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

@@ -5,6 +5,9 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Map;
/**
 * @author yeshijie on 2017/12/1.
 */
@@ -19,4 +22,5 @@ public interface IotOrderPurchaseDao extends PagingAndSortingRepository<IotOrder
    @Query(value = "SELECT IFNULL(SUM(purchase_num),0)  from iot_order_purchase WHERE order_id =?1 and del = 1 ",nativeQuery = true)
    int sumByOrderId(String orderId);
    IotOrderPurchaseDO findByOrderNo(String orderNo);
}

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

@@ -427,4 +427,20 @@ public class IotDeviceOrderService extends BaseJpaService<IotDeviceOrderDO,IotDe
        return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find_functions,iotOrderPurchaseVOList, page, size,count);
    }
    /**
     * 、获取所有订单编码
     * @return
     */
    public List<String> findAllOrderNo() {
        String sql="select a.order_no from iot_order_purchase a where  a.del = 1 GROUP BY a.order_no";
        List<Map<String, Object>> mapList = jdbcTempalte.queryForList(sql);
        ArrayList<String> list = new ArrayList<>();
        mapList.forEach(one->{
            String orderNo = (String) one.get("order_no");
            list.add(orderNo);
        });
        return list;
    }
}

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

@@ -5,10 +5,12 @@ 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;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.dao.message.IotMessageDao;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.device.IotOrderPurchaseDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;
@@ -48,6 +50,9 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
    @Autowired
    private IotDeviceDao iotDeviceDao;
    @Autowired
    private IotSystemDictDao iotSystemDictDao;
    /**
     * 新增
     * @param iotDeviceQualityInspectionPlan
@@ -56,7 +61,10 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
    @Transactional
    public IotDeviceQualityInspectionPlanDO create(IotDeviceQualityInspectionPlanDO iotDeviceQualityInspectionPlan) {
        IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findById(iotDeviceQualityInspectionPlan.getPurchaseId());
        IotOrderPurchaseDO purchaseDO = iotOrderPurchaseDao.findByOrderNo(iotDeviceQualityInspectionPlan.getOrderNo());
        iotDeviceQualityInspectionPlan.setPurchaseId(purchaseDO.getId());
        iotDeviceQualityInspectionPlan.setDeviceId(purchaseDO.getProductId());
        iotDeviceQualityInspectionPlan.setOrderNo(purchaseDO.getOrderNo());
        iotDeviceQualityInspectionPlan.setDeviceId(purchaseDO.getProductId());
@@ -225,23 +233,23 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     * 分页查找
     * @param page
     * @param size
     * @param purcharseId
     * @param status
     * @return
     */
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO> queryPage(String purcharseId, String orderNo, String startTime, String endTime, Integer page, Integer size){
    public MixEnvelop<IotDeviceQualityInspectionPlanVO, IotDeviceQualityInspectionPlanVO> queryPage(String status, String orderNo, String startTime, String endTime, Integer page, Integer size){
        StringBuffer sql = new StringBuffer("SELECT c.* from iot_device_quality_inspection_plan c  WHERE c.del=1 ");
        StringBuffer sqlCount = new StringBuffer("SELECT COUNT(c.id) count from iot_device_quality_inspection_plan c WHERE c.del=1 ");
        List<Object> args = new ArrayList<>();
        if(StringUtils.isNotBlank(purcharseId)){
            sql.append(" and c.purchase_id=? ");
            sqlCount.append(" and c.purchase_id='").append(purcharseId).append("' ");
            args.add(purcharseId);
        if(StringUtils.isNotBlank(status)){
            sql.append(" and c.status=? ");
            sqlCount.append(" and c.status='").append(status).append("' ");
            args.add(status);
        }
        if(StringUtils.isNotBlank(orderNo)){
            sql.append(" and c.order_no=? ");
            sqlCount.append(" and c.order_no='").append(orderNo).append("' ");
            args.add(orderNo);
            sql.append("and c.order_no like'%").append(orderNo).append("%' ");
            sqlCount.append(" and c.order_no like'%").append(orderNo).append("%' ");
        }
        if(StringUtils.isNotBlank(startTime)){
            sql.append(" and c.plan_time>=? ");
@@ -271,16 +279,10 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     */
    public void remindTimePlan(String time) {
        int remindTime = Integer.valueOf(time);
        List<IotDeviceQualityInspectionPlanDO> list = iotDeviceQualityInspectionPlanDao.findListAll();
        list.forEach(one->{
            Date remind = DateUtil.getPreDays(one.getPlanTime(), -remindTime);
            one.setRemindTime(remind);
            iotDeviceQualityInspectionPlanDao.save(one);
        });
        IotSystemDictDO qualityRemind= iotSystemDictDao.findByDictName("DEVICE_QUALITY_REMIND").get(0);
        qualityRemind.setTime(time);
        qualityRemind.setDel(1);
        iotSystemDictDao.save(qualityRemind);
    }
}

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

@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.device.IotDeviceDao;
import com.yihu.iot.dao.device.IotDeviceSimDao;
import com.yihu.iot.dao.device.IotPatientDeviceDao;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.jw.entity.iot.company.IotCompanyDO;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.platform.IotInterfaceAuditDO;
import com.yihu.jw.restmodel.iot.company.IotCompanyVO;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
@@ -47,6 +49,9 @@ public class IotDeviceSimService  extends BaseJpaService<IotDeviceSimDO, IotDevi
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private IotSystemDictDao iotSystemDictDao;
    /**
     * 增加SIM卡管理
     * @param advancePayment
@@ -154,19 +159,17 @@ public class IotDeviceSimService  extends BaseJpaService<IotDeviceSimDO, IotDevi
    /**
     *
     *SIM余额提醒
     * @param time
     * @param money
     * @param status
     */
    public void remind(String time, String money, String status) {
        Iterable<IotDeviceSimDO> list = iotDeviceSimDao.findAll();
        list.forEach(one->{
            one.setRemindTime(time);
            one.setRemindArrears(status);
            one.setRemindBalance(money);
            iotDeviceSimDao.save(one);
        });
        IotSystemDictDO sim = iotSystemDictDao.findByDictName("SIM_BALANCE_REMIND").get(0);
        sim.setCode(money);
        sim.setStatus(Integer.parseInt(status));
        sim.setTime(time);
        iotSystemDictDao.save(sim);
    }
}