1

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineDeviceEndpoint.java

@@ -646,6 +646,8 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
                                               @RequestParam(value = "content", required = false) String content,
                                               @ApiParam(name = "networkStatus", value = "设备网络状态")
                                               @RequestParam(value = "networkStatus", required = false) String networkStatus,
                                               @ApiParam(name = "faultState", value = "是否货道故障 1是0否")
                                                   @RequestParam(value = "faultState", required = false) String faultState,
                                               @ApiParam(name = "community", value = "所属社区")
                                               @RequestParam(value = "community", required = false) String community,
                                               @ApiParam(name = "town", value = "所属区域")
@@ -660,7 +662,7 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
                                               @RequestParam(value = "page") int page,
                                               @ApiParam(name = "size", value = "分页大小", required = true, defaultValue = "15")
                                               @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = deviceService.getDeviceListByUserId(content, networkStatus, community,town,
        JSONObject result = deviceService.getDeviceListByUserId(content, networkStatus,faultState, community,town,
                saleStatus, equType,
                userId, page, size);
        return success(result.getJSONArray("msg"), result.getInteger("count"), page, size);

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

@@ -242,14 +242,15 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        String sql = "select id,id_device idDevice,state,num,layer_no layerNo,wayer_no wayerNo,qty,drug_name drugName" +
                ",cargo_capacity cargoCapacity,shelf_status shelfStatus,cargo_state cargoState,fault_state faultState" +
                ",if(fault_state='1','故障',if(fault_state='0','正常','')) faultStateNam,if(cargo_state='1','开启',if(cargo_state='0','关闭','')) cargoStateName" +
                ",if(shelf_status='1','上架',if(shelf_status='0','下架','')) shelfStatusName";
                ",if(shelf_status='1','上架',if(shelf_status='0','下架','')) shelfStatusName" +
                ",DATE_FORMAT(update_time,'%Y-%m-%d %H:%i:%S') updateTime";
        String countSql = "select count(id) ";
        String filter = " from t_mediicinecabinet_inventory where id_device='"+idDevice+"' ";
        if(!StringUtils.isEmpty(startTime)){
            filter += " and update_time>='"+startTime+"'";
        }
        if(!StringUtils.isEmpty(endTime)){
            filter += " and end_time>='"+endTime+"'";
            filter += " and update_time>='"+endTime+"'";
        }
        String orderBy = " order by fault_state desc,update_time desc limit "+(page-1)*size+","+size;
@@ -316,11 +317,11 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        if("1".equals(temperatureStatus)){
            //正常
            filter += " and (t.temperaturecontrol!='1' or t.now_temperature is null or " +
                    " ( t.now_temperature <= t.waring_temperature_height and t.now_temperature >= t.waring_temperature_low))";
                    " ( t.now_temperature <= t.warning_temperature_height and t.now_temperature >= t.warning_temperature_low))";
        }
        if("2".equals(temperatureStatus)){
            //异常
            filter += " and t.temperaturecontrol='1' and (t.now_temperature>t.waring_temperature_height or t.now_temperature<t.waring_temperature_low)";
            filter += " and t.temperaturecontrol='1' and (t.now_temperature>t.warning_temperature_height or t.now_temperature<t.warning_temperature_low)";
        }
        if("1".equals(humidityStatus)){
            //正常
@@ -2890,7 +2891,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
     * @return
     * @throws Exception
     */
    public JSONObject getDeviceListByUserId(String content,String networkStatus, String community,String town,
    public JSONObject getDeviceListByUserId(String content,String networkStatus,String faultState, String community,String town,
                                            String saleStatus,String equType,String userId, int page, int size) throws Exception {
        JSONObject result = new JSONObject();
@@ -3022,14 +3023,21 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                    "    t.ratio AS ratio,\n" +
                    "    t.cargo_capacity AS cargoCapacity,\n" +
                    "    t.layer AS layer,\n" +
                    "    t.wayer AS wayer\n" +
                    "    t.wayer AS wayer,if(i.id_device is null,'否','是') faultState\n" +
                    "FROM\n" +
                    "    t_mediicine_device AS t\n" +
                    "    t_mediicine_device AS t " +
                    " left join (SELECT DISTINCT id_device from t_mediicinecabinet_inventory WHERE fault_state='1') i on i.id_device=t.id  " +
                    "WHERE 1=1 AND t.del = 1\n";
        }
        if (!StringUtils.isEmpty(content)) {
            conditionSql += "AND CONCAT(IFNULL(t.`equ_num`, ''), IFNULL(t.`equ_name`, '')) like '%" + content +"%'\n";
        }
        if("1".equals(faultState)){
            conditionSql += " and i.id_device is not null ";
        }
        if("0".equals(faultState)){
            conditionSql += " and i.id_device is null ";
        }
        if (!StringUtils.isEmpty(networkStatus)) {
            conditionSql += "AND t.network_status = '" + networkStatus +"'\n";
        }
@@ -3045,7 +3053,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        if (!StringUtils.isEmpty(equType)) {
            conditionSql += "AND t.equ_type like '%" + equType +"%'\n";
        }
        conditionSql += "AND t.belong_community IS NOT NULL  order by  t.network_status asc,t.sale_status desc \n";
        conditionSql += "AND t.belong_community IS NOT NULL order by  t.network_status asc,t.sale_status desc \n";
        //true
//        if (isAllocate) {
//
@@ -3226,6 +3234,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_device t " +
                " left join (SELECT DISTINCT id_device from t_mediicinecabinet_inventory WHERE fault_state='1') i on i.id_device=t.id " +
                "  where " +
                "  1=1  and t.del = 1  " +
                conditionSql;

svr/svr-base/src/main/resources/application.yml

@@ -60,7 +60,7 @@ es:
    servicePackLog: base_service_package_log
fast-dfs:
  tracker-server: 172.19.103.54:22122 #服务器地址
  tracker-server: 172.26.0.110:22122 #服务器地址
  connect-timeout: 2 #链接超时时间
  network-timeout: 30
  charset: ISO8859-1 #编码