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

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -188,6 +188,7 @@ public class BaseRequestMapping {
        public static final String UNBINDDEVICE  = "/unbindDevice";
        public static final String mergeAndSplitCargo  = "/mergeAndSplitCargo";
        public static final String openAndCloseCargo  = "/openAndCloseCargo";
        public static final String getDevicesByReplenishEr  = "/getDevicesByReplenishEr";
        public static final String getDeviceListByUserId  = "/getDeviceListByUserId";
        public static final String getDeviceListWithUserId  = "/getDeviceListWithUserId";
        public static final String getDeviceInventoryRecordListWithUserId  = "/getDeviceInventoryRecordListWithUserId";

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

@@ -385,6 +385,16 @@ public class MedicineDeviceEndpoint extends EnvelopRestEndpoint {
        return success(list, Mediicinedevice.class);
    }
    //getDevicesByReplenishEr
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDevicesByReplenishEr)
    @ApiOperation(value = "通过补货员用户id，查询补货员所在社区的设备列表", notes = "查询补货员所在社区的设备列表")
    public ListEnvelop<Mediicinedevice> getDevicesByReplenishEr(
            @ApiParam(name = "userIds", value = "补货员用户id,多个用英文逗号分隔", required = true)
            @RequestParam(value = "userIds") String userIds) throws Exception {
        JSONObject jsonObject = deviceService.getDevicesByReplenishEr(userIds);
        List<Mediicinedevice> list = JSONObject.parseArray(jsonObject.getJSONArray("msg").toJSONString(), Mediicinedevice.class);
        return success(list, Mediicinedevice.class);
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.getDeviceListByUserId)
    @ApiOperation(value = "通过人员id获取设备列表", notes = "获取设备列表")

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

@@ -99,13 +99,15 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "content", required = false) String content,
            @ApiParam(name = "community", value = "社区")
            @RequestParam(value = "community", required = false) String community,
            @ApiParam(name = "state", value = "备货单状态，1已生成，2未生成，3删除")
            @RequestParam(value = "state", required = false) String state,
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockupService.queryUpListFullInfo(startTime, endTime, content, community, userId,page,size,wechatId);
        JSONObject result = stockupService.queryUpListFullInfo(startTime, endTime, content, community, state, userId,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

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

@@ -242,7 +242,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    public JSONObject queryUpListFullInfo(
            String startTime, String endTime, String content,
            String community, String userId, int page, int size,String wechatId) throws Exception {
            String community, String state, String userId, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
        RoleDO role = roleDao.findOne(user.getRoleId());
@@ -334,6 +334,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        if (!StringUtils.isEmpty(community)){
            conditionSql += " and t.community = '" + community + "'";
        }
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = '" + state + "'";
        }
        sql = sql + conditionSql;
        List<Map<String,Object>> list=null;
@@ -342,7 +345,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        String countSql = " select " +
                "     COUNT(DISTINCT (t.id)) as count " +
                "   from " +
                "     t_mediicine_stockup t " +
                "     t_mediicine_stockup t left join base_user bu on t.replenish_er = bu.id left join t_mediicine_device tmd on t.replenish_equ = tmd.id " +
                "  where " +
                "  1=1   " +
                conditionSql;

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

@@ -34,6 +34,7 @@ import java.text.DecimalFormat;
import java.text.ParseException;
import java.util.*;
import java.util.logging.Logger;
import java.util.stream.Collectors;
/**
 * Created by Bing on 2021/9/23.
@@ -532,15 +533,33 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            result.put("response", ConstantUtils.FAIL);
            return result.toJSONString();
        }
        mediicinedevice.setHumidity(humidity);
        mediicinedevice.setTemperature(temperature);
        mediicinedevice.setHumiditycontrol(humiditycontrol);
        mediicinedevice.setTemperaturecontrol(temperaturecontrol);
        mediicinedevice.setHeat(heat);
        mediicinedevice.setWaringHumidityHeight(waringHumidityHeight);
        mediicinedevice.setWarningTemperatureHeight(warningTemperatureHeight);
        mediicinedevice.setWarningTemperatureLow(warningTemperatureLow);
        mediicinedevice.setWaringHumidityLow(waringHumidityLow);
        if (humidity != null && !StringUtils.isEmpty(humidity)) {
            mediicinedevice.setHumidity(humidity);
        }
        if (humidity != null && !StringUtils.isEmpty(temperature)) {
            mediicinedevice.setTemperature(temperature);
        }
        if (humidity != null && !StringUtils.isEmpty(humiditycontrol)) {
            mediicinedevice.setHumiditycontrol(humiditycontrol);
        }
        if (humidity != null && !StringUtils.isEmpty(temperaturecontrol)) {
            mediicinedevice.setTemperaturecontrol(temperaturecontrol);
        }
        if (humidity != null && !StringUtils.isEmpty(heat)) {
            mediicinedevice.setHeat(heat);
        }
        if (humidity != null && !StringUtils.isEmpty(waringHumidityHeight)) {
            mediicinedevice.setWaringHumidityHeight(waringHumidityHeight);
        }
        if (humidity != null && !StringUtils.isEmpty(warningTemperatureHeight)) {
            mediicinedevice.setWarningTemperatureHeight(warningTemperatureHeight);
        }
        if (humidity != null && !StringUtils.isEmpty(warningTemperatureLow)) {
            mediicinedevice.setWarningTemperatureLow(warningTemperatureLow);
        }
        if (humidity != null && !StringUtils.isEmpty(waringHumidityLow)) {
            mediicinedevice.setWaringHumidityLow(waringHumidityLow);
        }
        this.save(mediicinedevice);
        medicineServive.SetTemperatureAndHumidity(mediicinedevice.getEquNum(), temperature,
                humidity, "1".equals(temperaturecontrol) ? true : false, "1".equals(humiditycontrol) ? true : false, "1".equals(heat) ? true : false);
@@ -1069,6 +1088,105 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
    }
    /**
     * 查询补货员所在社区的设备列表
     * @param userIds
     * @return
     * @throws Exception
     */
    public JSONObject getDevicesByReplenishEr(String userIds) throws Exception {
        JSONObject result = new JSONObject();
        if(StringUtils.isEmpty(userIds)){
            result.put("msg","parameter userIds is null ");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        String[] userIdArray = userIds.split(",");
        List<String> userIdList = Arrays.stream(userIdArray).filter(string -> !StringUtils.isEmpty(string)).collect(Collectors.toList());
        List<String> communitys = new ArrayList<>();
        boolean isFirst = true;
        for (String s : userIdList) {
            if (!StringUtils.isEmpty(s)) {
                String sql = "SELECT\n" +
                        "\tt.hospital AS community\n" +
                        "FROM\n" +
                        "\twlyy_user_area AS t\n" +
                        "WHERE\n" +
                        "\t',"+ s +",' like CONCAT('%,',t.user_id,',%')\n" +
                        "AND t.del = 1;";
                if (isFirst) {
                    communitys.addAll(jdbcTemplate.queryForList(sql, String.class));
                    isFirst = false;
                }else {
                    communitys.retainAll(jdbcTemplate.queryForList(sql, String.class));
                }
            }
        }
        String sql = "";
        {
            sql += "SELECT\n" +
                    "\tt.id,\n" +
                    "\tt.belong_community,\n" +
                    "\tt.community,\n" +
                    "\tt.del,\n" +
                    "\tt.delivery_address,\n" +
                    "\tt.detail_address,\n" +
                    "\tt.equ_area,\n" +
                    "\tt.equ_class,\n" +
                    "\tt.equ_info,\n" +
                    "\tt.equ_name,\n" +
                    "\tt.equ_num,\n" +
                    "\tt.equ_type,\n" +
                    "\tt.fbelong_community,\n" +
                    "\tt.machine_code,\n" +
                    "\tt.network_status,\n" +
                    "\tt.poweron_test,\n" +
                    "\tt.reg_date,\n" +
                    "\tt.sale_status,\n" +
                    "\tt.signalintensity,\n" +
                    "\tt.upgr_adesit,\n" +
                    "\tt.`status`,\n" +
                    "\tt.card_status,\n" +
                    "\tt.operator,\n" +
                    "\tt.pack_age,\n" +
                    "\tt.usage_flow,\n" +
                    "\tt.flow,\n" +
                    "\tt.create_time,\n" +
                    "\tt.create_user,\n" +
                    "\tt.create_user_name,\n" +
                    "\tt.update_time,\n" +
                    "\tt.update_user,\n" +
                    "\tt.update_user_name,\n" +
                    "\tt.aisles,\n" +
                    "\tt.capacity,\n" +
                    "\tt.ratio,\n" +
                    "\tt.cargo_capacity,\n" +
                    "\tt.layer,\n" +
                    "\tt.wayer,\n" +
                    "\tt.humidity,\n" +
                    "\tt.temperature,\n" +
                    "\tt.humiditycontrol,\n" +
                    "\tt.temperaturecontrol,\n" +
                    "\tt.heat,\n" +
                    "\tt.warning_temperature_height,\n" +
                    "\tt.waring_humidity_height,\n" +
                    "\tt.warning_temperature_low,\n" +
                    "\tt.waring_humidity_low,\n" +
                    "\tt.lng,\n" +
                    "\tt.lat\n" +
                    "FROM\n" +
                    "\tt_mediicine_device AS t\n" +
                    "WHERE\n" +
                    "\tt.del = 1\n" +
                    "AND ',"+ String.join(",", communitys) +",' LIKE CONCAT('%,',t.belong_community,',%')";
        }
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql);
        result.put("msg", JavaBeanUtils.getInstance().mapListJson(list));
        return result;
    }
    /**
     * 根据人员id，查询与之绑定的设备
     * @param userId
@@ -3380,6 +3498,9 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
            inventory.setQty(qty);
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(cargoCapacity)){
            if (Integer.parseInt(cargoCapacity) > 99) {
                throw new RuntimeException("货道容量最多99个，如超过请放置另一格");
            }
            inventory.setCargoCapacity(cargoCapacity);
            cargoCapacityChanged = true;
        }