Merge branch 'dev' of humingfen/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/iot/device/IotDeviceInventoryLogDO.java

@@ -35,7 +35,7 @@ public class IotDeviceInventoryLogDO extends UuidIdentityEntityWithOperator impl
//    @Column(name = "num")
//    private Integer num;//数量
    @Column(name = "type")
    private String type;//调拨类型（1入库 2设备调拨出库 3核销出库）
    private Integer type;//调拨类型（1入库 2设备调拨出库 3核销出库）
    @Column(name = "remark")
    private String remark;//备注
@@ -111,11 +111,11 @@ public class IotDeviceInventoryLogDO extends UuidIdentityEntityWithOperator impl
        this.hospitalName = hospitalName;
    }
    public String getType() {
    public Integer getType() {
        return type;
    }
    public void setType(String type) {
    public void setType(Integer type) {
        this.type = type;
    }

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

@@ -180,6 +180,8 @@ public class IotRequestMapping {
        //设备库存
        public static final String getDeviceInventoryList = "getDeviceInventoryList";
        public static final String updateInventory = "updateInventory";
        public static final String getDeviceInventoryLog = "getDeviceInventoryLog";
        public static final String getDeviceInventoryLogDetail = "getDeviceInventoryLogDetail";
        public static final String isSnExist = "isSnExist";
        public static final String isSimExist = "isSimExist";

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

@@ -0,0 +1,138 @@
package com.yihu.jw.restmodel.iot.device;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.yihu.jw.restmodel.iot.common.BaseVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.util.List;
/**
 * 设备出入库记录表
 * @author humingfen on 2020/5/6.
 */
@JsonInclude(JsonInclude.Include.ALWAYS)
@ApiModel(value = "设备出入库记录表", description = "设备出入库记录表")
public class IotDeviceInventoryLogVO extends BaseVO implements Serializable {
    @ApiModelProperty("产品id")
    private String productId;
    @ApiModelProperty("设备名称")
    private String name;
    @ApiModelProperty("设备类型")
    private String categoryCode;//设备类型标识
    @ApiModelProperty("设备类型名称")
    private String categoryName;//设备类型名称
    @ApiModelProperty("归属社区")
    private String hospital;
    @ApiModelProperty("归属社区名称")
    private String hospitalName;
    @ApiModelProperty("订单id")
    private String orderId;
    @ApiModelProperty("订单编号")
    private String orderNo;
    @ApiModelProperty("调拨类型（1入库 2设备调拨出库 3核销出库）")
    private Integer type;
    @ApiModelProperty("备注")
    private String remark;
    @ApiModelProperty("数量")
    private Integer num;
    @ApiModelProperty("设备列表")
    private List<IotDeviceVO> deviceVOList;
    public String getProductId() {
        return productId;
    }
    public void setProductId(String productId) {
        this.productId = productId;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCategoryCode() {
        return categoryCode;
    }
    public void setCategoryCode(String categoryCode) {
        this.categoryCode = categoryCode;
    }
    public String getCategoryName() {
        return categoryName;
    }
    public void setCategoryName(String categoryName) {
        this.categoryName = categoryName;
    }
    public String getHospital() {
        return hospital;
    }
    public void setHospital(String hospital) {
        this.hospital = hospital;
    }
    public String getHospitalName() {
        return hospitalName;
    }
    public void setHospitalName(String hospitalName) {
        this.hospitalName = hospitalName;
    }
    public String getOrderId() {
        return orderId;
    }
    public void setOrderId(String orderId) {
        this.orderId = orderId;
    }
    public String getOrderNo() {
        return orderNo;
    }
    public void setOrderNo(String orderNo) {
        this.orderNo = orderNo;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public String getRemark() {
        return remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    public Integer getNum() {
        return num;
    }
    public void setNum(Integer num) {
        this.num = num;
    }
    public List<IotDeviceVO> getDeviceVOList() {
        return deviceVOList;
    }
    public void setDeviceVOList(List<IotDeviceVO> deviceVOList) {
        this.deviceVOList = deviceVOList;
    }
}

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

@@ -1,6 +1,7 @@
package com.yihu.iot.controller.device;
import com.yihu.iot.service.device.IotDeviceInventoryService;
import com.yihu.jw.restmodel.iot.device.IotDeviceInventoryLogVO;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -11,7 +12,6 @@ import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
 * @author humingfen on 2020.4.29
 */
@@ -26,15 +26,15 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
    @GetMapping(value = IotRequestMapping.Device.getDeviceInventoryList)
    @ApiOperation(value = "获取设备库存列表", notes = "获取设备库存列表")
    public MixEnvelop<IotDeviceVO, IotDeviceVO> getDeviceInventoryList(@ApiParam(name = "name", value = "设备名称")
                                                           @RequestParam(value = "name", required = false) String name,
                                                                       @RequestParam(value = "name", required = false) String name,
                                                                       @ApiParam(name = "categoryCode", value = "设备类型标识")
                                                                       @RequestParam(value = "categoryCode", required = false) String categoryCode,
                                                                       @ApiParam(name = "hospitalName", value = "单位名称")
                                                                           @RequestParam(value = "hospitalName", required = false) String hospitalName,
                                                                       @RequestParam(value = "hospitalName", required = false) String hospitalName,
                                                                       @ApiParam(name = "page", value = "第几页", defaultValue = "1")
                                                                           @RequestParam(value = "page", required = false) Integer page,
                                                                       @RequestParam(value = "page", required = false) Integer page,
                                                                       @ApiParam(name = "pageSize", value = "每页记录数")
                                                                           @RequestParam(value = "pageSize", required = false) Integer pageSize) {
                                                                       @RequestParam(value = "pageSize", required = false) Integer pageSize) {
        try {
            return deviceInventoryService.getDeviceInventoryList(name, categoryCode, hospitalName, page, pageSize);
        } catch (Exception e) {
@@ -45,8 +45,8 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
    @PostMapping(value = IotRequestMapping.Device.updateInventory)
    @ApiOperation(value = "设备库存出入库", notes = "设备库存出入库")
    public MixEnvelop<IotDeviceVO, IotDeviceVO> updateInventory(@ApiParam(name = "jsonData", value = "设备出入库json",defaultValue = "")
                                                                       @RequestParam(value = "jsonData", required = true) String jsonData) {
    public MixEnvelop<IotDeviceVO, IotDeviceVO> updateInventory(@ApiParam(name = "jsonData", value = "设备出入库json", defaultValue = "")
                                                                @RequestParam(value = "jsonData", required = true) String jsonData) {
        try {
            Integer count = deviceInventoryService.updateInventory(jsonData);
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_updateInventory, count);
@@ -55,4 +55,37 @@ public class IotDeviceInventoryController extends EnvelopRestEndpoint {
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Device.getDeviceInventoryLog)
    @ApiOperation(value = "获取设备出入库记录", notes = "获取设备出入库记录")
    public MixEnvelop<IotDeviceInventoryLogVO, IotDeviceInventoryLogVO> getDeviceInventoryLog(@ApiParam(name = "name", value = "设备名称")
                                                                                              @RequestParam(value = "name", required = false) String name,
                                                                                              @ApiParam(name = "categoryCode", value = "设备类型标识")
                                                                                              @RequestParam(value = "categoryCode", required = false) String categoryCode,
                                                                                              @ApiParam(name = "type", value = "调拨类型（1入库 2设备调拨出库 3核销出库）")
                                                                                              @RequestParam(value = "type", required = false) Integer type,
                                                                                              @ApiParam(name = "page", value = "第几页", defaultValue = "1")
                                                                                              @RequestParam(value = "page", required = false) Integer page,
                                                                                              @ApiParam(name = "pageSize", value = "每页记录数")
                                                                                              @RequestParam(value = "pageSize", required = false) Integer pageSize) {
        try {
            return deviceInventoryService.getDeviceInventoryLog(name, categoryCode, type, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.Device.getDeviceInventoryLogDetail)
    @ApiOperation(value = "获取设备出入库记录详情", notes = "获取设备出入库记录详情")
    public MixEnvelop<IotDeviceInventoryLogVO, IotDeviceInventoryLogVO> getDeviceInventoryLogDetail(@ApiParam(name = "id", value = "出入库记录id")
                                                                                              @RequestParam(value = "id", required = true) String id) {
        try {
            IotDeviceInventoryLogVO deviceInventoryLogVO = deviceInventoryService.getDeviceInventoryLogDetail(id);
            return MixEnvelop.getSuccess(IotRequestMapping.Device.message_success_updateInventory, deviceInventoryLogVO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
}

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

@@ -41,4 +41,6 @@ public interface IotDeviceDao extends PagingAndSortingRepository<IotDeviceDO, St
    @Query("from IotDeviceDO w where w.orderId =?1 and w.del=1")
    List<IotDeviceDO> findListByOrderId(String orderId);
    List<IotDeviceDO> findListByInventoryLogId(String id);
}

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

@@ -4,14 +4,13 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.JsonObject;
import com.yihu.iot.dao.device.IotDeviceDao;
import com.yihu.iot.dao.device.IotDeviceInventoryLogDao;
import com.yihu.iot.dao.device.IotDeviceOrderDao;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import com.yihu.jw.entity.iot.device.IotDeviceInventoryLogDO;
import com.yihu.jw.entity.iot.device.IotDeviceOrderDO;
import com.yihu.jw.entity.specialist.rehabilitation.RehabilitationTemplateDetailDO;
import com.yihu.jw.restmodel.iot.device.IotDeviceInventoryLogVO;
import com.yihu.jw.restmodel.iot.device.IotDeviceVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -109,13 +108,13 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
            //根据类型处理出入库
            for (IotDeviceDO deviceDO : deviceDOS) {
                String deviceSn = deviceDO.getDeviceSn();
                String type = deviceInventoryLogDO.getType();//调拨类型（1入库 2设备调拨出库 3核销出库）
                Integer type = deviceInventoryLogDO.getType();//调拨类型（1入库 2设备调拨出库 3核销出库）
                //设备出库，更换相关信息
                if(type.equals("1")){
                if (type.equals("1")) {
                    deviceDO.setSaasId(getCode());
                }else {
                } else {
                    deviceDO = iotDeviceDao.findByDeviceSn(deviceSn);
                    if(type.equals("3")){
                    if (type.equals("3")) {
                        deviceDO.setDel(0);
                        deviceDO.setStatus("2");
                        deviceDO.setInventoryLogId(deviceInventoryLogDO.getId());
@@ -149,4 +148,41 @@ public class IotDeviceInventoryService extends BaseJpaService<IotDeviceInventory
        iotDeviceDao.save(deviceDOList);
        return deviceDOList.size();
    }
    public MixEnvelop<IotDeviceInventoryLogVO, IotDeviceInventoryLogVO> getDeviceInventoryLog(String name, String categoryCode, Integer type, Integer page, Integer pageSize) {
        String sql = "SELECT l.*, count(d.id) num FROM `iot_device_inventory_log` l LEFT JOIN iot_device d on l.id = d.inventory_log_id where 1=1 ";
        if (StringUtils.isNotBlank(name)) {
            sql += "and l.name like '%" + name + "%' ";
        }
        if (StringUtils.isNotBlank(categoryCode)) {
            sql += "and l.category_code = '" + categoryCode + "' ";
        }
        if (type != null) {
            sql += "and l.type = '" + type + "' ";
        }
        sql += "GROUP BY l.id order BY l.create_time desc ";
        //判断是否需要分页
        if (page != null && pageSize != null) {
            Long count = Long.valueOf(jdbcTempalte.queryForList(sql).size());
            sql += "limit " + (page - 1) * pageSize + "," + pageSize;
            List<IotDeviceInventoryLogVO> inventoryLogVOList = jdbcTempalte.query(sql, new BeanPropertyRowMapper<>(IotDeviceInventoryLogVO.class));
            return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find, inventoryLogVOList, page, pageSize, count);
        } else {
            List<IotDeviceInventoryLogVO> inventoryLogVOList = jdbcTempalte.query(sql, new BeanPropertyRowMapper<>(IotDeviceInventoryLogVO.class));
            return MixEnvelop.getSuccessList(IotRequestMapping.Common.message_success_find, inventoryLogVOList);
        }
    }
    public IotDeviceInventoryLogVO getDeviceInventoryLogDetail(String id) {
        IotDeviceInventoryLogDO deviceInventoryLogDO = deviceInventoryLogDao.findOne(id);
        //获取出入库详情设备列表
        List<IotDeviceDO> deviceDOS = iotDeviceDao.findListByInventoryLogId(id);
        IotDeviceInventoryLogVO deviceInventoryLogVO = convertToModel(deviceInventoryLogDO, IotDeviceInventoryLogVO.class);
        if (deviceDOS != null && deviceDOS.size() > 0) {
            List<IotDeviceVO> deviceVOS = new ArrayList<>();
            deviceInventoryLogVO.setDeviceVOList(convertToModels(deviceDOS, deviceVOS, IotDeviceVO.class));
        }
        deviceInventoryLogVO.setNum(deviceDOS.size());
        return deviceInventoryLogVO;
    }
}