Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-iot/src/main/java/com/yihu/iot/controller/common/IotSystemDictController.java

@@ -49,7 +49,7 @@ public class IotSystemDictController extends EnvelopRestEndpoint {
        try {
//            List<IotSystemDictDO> dictDOList = new ObjectMapper().readValue(jsonData, new TypeReference<List<IotSystemDictDO>>(){});
            IotSystemDictDO dictDO = toEntity(jsonData, IotSystemDictDO.class);
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, iotSystemDictService.create(dictDO));
            return iotSystemDictService.create(dictDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());

svr/svr-iot/src/main/java/com/yihu/iot/controller/dict/HospitalController.java

@@ -28,7 +28,7 @@ public class HospitalController extends EnvelopRestEndpoint {
            @RequestParam(value = "jsonData", required = true) String jsonData){
        try {
            IotHospitalDO hospitalDO = toEntity(jsonData, IotHospitalDO.class);
            return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, hospitalService.create(hospitalDO));
            return hospitalService.create(hospitalDO);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
@@ -47,8 +47,7 @@ public class HospitalController extends EnvelopRestEndpoint {
            @ApiParam(name = "pageSize", value = "页面大小")
            @RequestParam(value = "pageSize", required = false) Integer pageSize){
        try {
            List<IotHospitalDO> hospitalDOList = hospitalService.getListByName(name, level, page, pageSize);
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_find, hospitalDOList);
            return hospitalService.getListByName(name, level, page, pageSize);
        } catch (Exception e) {
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());

svr/svr-iot/src/main/java/com/yihu/iot/dao/dict/IotHospitalDao.java

@@ -6,4 +6,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface IotHospitalDao extends PagingAndSortingRepository<IotHospitalDO, String>,
        JpaSpecificationExecutor<IotHospitalDO> {
    IotHospitalDO findByNameAndDel(String name, String del);
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/dict/IotSystemDictDao.java

@@ -21,6 +21,8 @@ public interface IotSystemDictDao extends PagingAndSortingRepository<IotSystemDi
    IotSystemDictDO findByDictNameAndCodeAndDel(String dictName, String code, Integer del);
    IotSystemDictDO findByDictNameAndValueAndDel(String dictName, String value, Integer del);
    @Query("from IotSystemDictDO w where w.parentCode in (?1) and w.del = 1 ")
    List<IotSystemDictDO> findByParentCode(String parentCode);
}

svr/svr-iot/src/main/java/com/yihu/iot/service/company/IotCompanyService.java

@@ -713,6 +713,15 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
        companyDO.setAuditName(uname);
        iotCompanyDao.save(companyDO);
        //根据注册类型配置相应角色菜单,注册类型（1：厂商注册  0：平台注册）
        String roleId = "";
        if(companyDO.getAccountType().equals("0")){
            roleId = "paltform";
        }else if(companyDO.getAccountType().equals("1")){
            roleId = "company";
        }
        String sql = "update `iot-base`.base_user set role_id ='" + roleId + "' WHERE id ='"+companyDO.getEhrUserId() + "' ";
        jdbcTempalte.update(sql);
        return MixEnvelop.getSuccess("审核操作成功");
    }

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

@@ -39,7 +39,7 @@ public class IotDeviceTransfersService extends BaseJpaService<IotDeviceTransfers
     * @return
     */
    public MixEnvelop<IotDeviceTransfersDO, IotDeviceTransfersDO> getDeviceTransfersList(String name, String categoryCode, Integer page, Integer pageSize) {
        String sql = "SELECT * FROM `iot_device_transfers` t where t.`status` != -1 ";
        String sql = "SELECT * FROM `iot_device_transfers` t where 1=1 ";
        if (StringUtils.isNotBlank(name)) {
            sql += "and t.product_name like '%" + name + "%' ";
        }

svr/svr-iot/src/main/java/com/yihu/iot/service/dict/IotHospitalService.java

@@ -2,6 +2,8 @@ package com.yihu.iot.service.dict;
import com.yihu.iot.dao.dict.IotHospitalDao;
import com.yihu.jw.entity.iot.dict.IotHospitalDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,14 +23,19 @@ public class IotHospitalService extends BaseJpaService<IotHospitalDO, IotHospita
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public IotHospitalDO create(IotHospitalDO hospitalDO) {
    public MixEnvelop create(IotHospitalDO hospitalDO) {
        //判断该单位是否已添加
        IotHospitalDO oldHospital = hospitalDao.findByNameAndDel(hospitalDO.getName(), "1");
        if(oldHospital != null){
            return MixEnvelop.getError("该单位已存在，请重新输入！");
        }
        hospitalDO.setSaasId(getCode());
        hospitalDO.setDel("1");
        hospitalDao.save(hospitalDO);
        return hospitalDO;
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create, hospitalDO);
    }
    public List<IotHospitalDO> getListByName(String name, String level, Integer page, Integer pageSize) {
    public MixEnvelop<IotHospitalDO, IotHospitalDO> getListByName(String name, String level, Integer page, Integer pageSize) {
        String sql = "SELECT * FROM `iot_hospital` h WHERE h.del = 1 ";
        if(StringUtils.isNotBlank(name)){
            sql += "and h.name like '%" + name + "%' ";
@@ -37,9 +44,13 @@ public class IotHospitalService extends BaseJpaService<IotHospitalDO, IotHospita
            sql += "and h.level = '" + level + "' ";
        }
        if(page != null && pageSize != null){
            Long count = Long.valueOf(jdbcTemplate.queryForList(sql).size());
            sql += "limit " + (page-1)*pageSize + "," + pageSize;
            List<IotHospitalDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(IotHospitalDO.class));
            return MixEnvelop.getSuccessListWithPage(IotRequestMapping.Common.message_success_find, list, page, pageSize, count);
        }else {
            List<IotHospitalDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(IotHospitalDO.class));
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_find, list);
        }
        List<IotHospitalDO> list = jdbcTemplate.query(sql, new BeanPropertyRowMapper(IotHospitalDO.class));
        return list;
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/service/dict/IotSystemDictService.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.dict.IotSystemDictDao;
import com.yihu.iot.service.common.MyJdbcTemplate;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,9 +43,14 @@ public class IotSystemDictService extends BaseJpaService<IotSystemDictDO,IotSyst
    }
    public IotSystemDictDO create(IotSystemDictDO dictDO) {
    public MixEnvelop<IotSystemDictDO, IotSystemDictDO> create(IotSystemDictDO dictDO) {
        String value = dictDO.getValue();
        String parentCode = dictDO.getParentCode();
        //判断该value值是否被占用
        IotSystemDictDO oldSystemDictDO = iotSystemDictDao.findByDictNameAndValueAndDel(dictDO.getDictName(), dictDO.getValue(), 1);
        if(oldSystemDictDO != null){
            return MixEnvelop.getError("该名称已被使用，请重新输入！");
        }
        //判断新增或者编辑
        if(StringUtils.isNotBlank(dictDO.getCode())) {
            dictDO = iotSystemDictDao.findByDictNameAndCodeAndDel(dictDO.getDictName(), dictDO.getCode(), 1);
@@ -65,7 +72,7 @@ public class IotSystemDictService extends BaseJpaService<IotSystemDictDO,IotSyst
            dictDO.setCreateTime(new Date());
        }
        iotSystemDictDao.save(dictDO);
        return dictDO;
        return MixEnvelop.getSuccess(IotRequestMapping.Company.message_success_create,dictDO);
    }
    /**