Merge branch 'dev' of chaoren1/wlyy2.0 into medicare

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinewarray.java

@@ -161,6 +161,12 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
     */
    private String otherCouont;
    /**
     * 故障详细内容
     */
    private String remark;
    public Mediicinewarray() {
    }
@@ -403,4 +409,12 @@ public class Mediicinewarray extends UuidIdentityEntityWithOperator implements S
    public void setOtherCouont(String otherCouont) {
        this.otherCouont = otherCouont;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -235,7 +235,15 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "humidity", value = "湿度", required = false)
            @RequestParam(value = "humidity", required = false) Float humidity,
            @ApiParam(name = "type",value = "故障类型",required = false)
            @RequestParam(value = "type",required = false)String type) throws Exception {
            @RequestParam(value = "type",required = false)String type,
            @ApiParam(name = "remark",value = "故障详细内容")
            @RequestParam(value = "remark",required = false) String remark,
            @ApiParam(name = "shipCouont",value = "出货异常次数")
            @RequestParam(value = "shipCouont",required = false) Integer shipCouont,
            @ApiParam(name = "plusCouont",value = "串口异常次数")
            @RequestParam(value = "plusCouont",required = false) Integer plusCouont,
            @ApiParam(name = "otherCouont",value = "其他异常次数")
            @RequestParam(value = "otherCouont",required = false) Integer otherCouont) throws Exception {
        if (StringUtils.isEmpty(type)){
            Map<String,Object> mediicinewarray = warrayService.warning(equNum,temperature,humidity,type);
            if (mediicinewarray==null){
@@ -246,7 +254,7 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
            }
            return success(mediicinewarray.get("msg"));
        }
        return success(deviceService.uploadDeviceInfo(equNum, temperature, humidity, type));
        return success(deviceService.uploadDeviceInfo(equNum, temperature, humidity, type,remark, shipCouont, plusCouont, otherCouont));
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineWarrayService.java

@@ -85,7 +85,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -179,7 +180,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -272,7 +274,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -360,7 +363,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -448,7 +452,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -534,7 +539,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -622,7 +628,8 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
                "    t.create_user_name as createUserName,\n" +
                "    t.update_time as updateTime,\n" +
                "    t.update_user as updateUser,\n" +
                "    t.update_user_name as updateUserName\n" +
                "    t.update_user_name as updateUserName,\n" +
                "    t.remark as remark\n" +
                "FROM\n" +
                "    t_mediicine_warray AS t where 1=1";
@@ -769,7 +776,7 @@ public class MedicineWarrayService extends BaseJpaService<Mediicinewarray, Medii
        mediicinedevice.setNetworkStatus("1");
        mediicinedevice.setSaleStatus("1");
        deviceDao.save(mediicinedevice);
        Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type);
        Mediicinewarray mediicinewarray = medicinedeviceService.uploadDeviceInfo(equNum, temperature, humidity, type, null, null, null, null);
        result.put("msg",mediicinewarray);
        return result;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -483,7 +483,8 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @return
     */
    @Transactional(rollbackFor = Exception.class)
    public Mediicinewarray  uploadDeviceInfo(String equNum, Float temperature,Float humidity,String type){
    public Mediicinewarray  uploadDeviceInfo(String equNum, Float temperature,Float humidity,String type,
                                             String remark, Integer shipCouont, Integer plusCouont, Integer otherCouont){
        Mediicinewarray mediicinewarray = new Mediicinewarray();
        Mediicinedevice mediicinedevice = deviceDao.findMediicinedeviceByEquNum(equNum);
        mediicinewarray.setEquNum(mediicinedevice.getEquNum());
@@ -498,6 +499,18 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        mediicinewarray.setEquType(mediicinedevice.getEquType());
        mediicinewarray.setEquInfo(mediicinedevice.getEquInfo());
        mediicinewarray.setLogTime(new Date());
        if (shipCouont != null) {
            mediicinewarray.setShipCouont(shipCouont + "");
        }
        if (plusCouont != null) {
            mediicinewarray.setPlusCouont(plusCouont+ "");
        }
        if (otherCouont != null) {
            mediicinewarray.setOtherCouont(otherCouont + "");
        }
        if (remark != null) {
            mediicinewarray.setRemark(remark);
        }
        return mediicinewarrayDao.save(mediicinewarray);
    }