物联网 BUG修复

app/public-health-server/src/main/java/com/yihu/health/security/core/EhrWebAuthenticationProvider.java

@@ -157,8 +157,8 @@ public class EhrWebAuthenticationProvider extends AbstractUserDetailsAuthenticat
//import org.springframework.security.authentication.BadCredentialsException;
//import org.springframework.security.authentication.InternalAuthenticationServiceException;
//import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
//import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider;
//import org.springframework.security.authentication.dao.SaltSource;
//import org.springframework.security.authentication.dict.AbstractUserDetailsAuthenticationProvider;
//import org.springframework.security.authentication.dict.SaltSource;
//import org.springframework.security.authentication.encoding.PasswordEncoder;
//import org.springframework.security.authentication.encoding.PlaintextPasswordEncoder;
//import org.springframework.security.core.AuthenticationException;

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -1,8 +1,8 @@
//package com.yihu.jw.doctor.service;
//
//import com.alibaba.fastjson.JSON;
//import com.yihu.jw.doctor.dao.BaseDoctorDao;
//import com.yihu.jw.doctor.dao.DoctorSpecialDiseaseDao;
//import com.yihu.jw.doctor.dict.BaseDoctorDao;
//import com.yihu.jw.doctor.dict.DoctorSpecialDiseaseDao;
//import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
//import com.yihu.jw.entity.base.doctor.DoctorSpecialDiseaseDo;
//import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;

business/base-service/src/main/java/com/yihu/jw/order/BusinessOrderService.java

@@ -60,7 +60,7 @@ import java.util.*;
 * 业务订单
 */
@Service
public class BusinessOrderService extends BaseJpaService {
public class BusinessOrderService extends BaseJpaService<BusinessOrderDO,BusinessOrderDao> {
    private Logger logger = LoggerFactory.getLogger(BusinessOrderService.class);

business/base-service/src/main/java/com/yihu/jw/wechat/dao/WxTemplateDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.wechat.dao;//package com.yihu.jw.business.wx.dao;
package com.yihu.jw.wechat.dao;//package com.yihu.jw.business.wx.dict;
import com.yihu.jw.entity.base.wx.WxTemplateDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

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

@@ -27,7 +27,7 @@ public class IotRequestMapping {
        public static final String workType = api_iot_common + "/workType";
        public static final String hospital = api_iot_common + "/hospital";
        public static final String interfaceAudit = api_iot_common + "/interfaceAudit";
        public static final String monitorPlatform = api_iot_common + "/monitorPlatform";
        public static final String monitorPlatform = api_iot_common + "/open/monitorPlatform";//免登录加上open
        public static final String sim = api_iot_common + "/sim";

svr/figure-label/src/main/java/com/yihu/wlyy/figure/label/config/db/FigureLabelJpa.java

@@ -33,7 +33,7 @@ import java.util.Properties;
@EnableJpaRepositories(
        entityManagerFactoryRef = "EntityManagerFactory",
        transactionManagerRef = "TransactionManager",
        basePackages = {"com.yihu.wlyy.figure.label.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.wlyy.figure.label.dict"})   //设置Repository所在位置
public class FigureLabelJpa {
    @Autowired

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictDoctorDutyDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.dict;
//package com.yihu.jw.base.dict.dict;
//
//import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/dict/DictHospitalDeptDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.dict;
//package com.yihu.jw.base.dict.dict;
//
//import com.yihu.jw.entity.base.dict.DictDiseaseDO;
//import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorHospitalDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.doctor;
//package com.yihu.jw.base.dict.doctor;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/doctor/BaseDoctorRoleDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.doctor;
//package com.yihu.jw.base.dict.doctor;
//
//import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/function/FunctionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.function;
//package com.yihu.jw.base.dict.function;
//
//import com.yihu.jw.entity.base.function.FunctionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/org/BaseOrgDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.org;
//package com.yihu.jw.base.dict.org;
//
//import com.yihu.jw.entity.base.org.BaseOrgDO;
//import org.springframework.data.domain.Pageable;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasDefaultModuleFunctionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.saas;
//package com.yihu.jw.base.dict.saas;
//
//import com.yihu.jw.entity.base.saas.SaasDO;
//import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/saas/SaasModuleFunctionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.saas;
//package com.yihu.jw.base.dict.saas;
//
//import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/version/AppVersionDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.base.dao.version;
//package com.yihu.jw.base.dict.version;
//
//import com.yihu.jw.entity.base.version.AppVersionDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/wx/WxGraphicMessageDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.wx;//package com.yihu.jw.business.wx.dao;
package com.yihu.jw.base.dao.wx;//package com.yihu.jw.business.wx.dict;
import com.yihu.jw.entity.base.wx.WxGraphicMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-base/src/main/java/com/yihu/jw/base/service/function/FunctionService.java

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.function;
//
//import com.yihu.jw.base.dao.function.FunctionDao;
//import com.yihu.jw.base.dict.function.FunctionDao;
//import com.yihu.jw.entity.base.function.FunctionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/patient/PatientFamilyMemberService.java

@@ -1,9 +1,9 @@
//package com.yihu.jw.base.service.patient;
//
//import com.yihu.jw.base.dao.patient.BasePatientFamilyMemberDao;
//import com.yihu.jw.base.dict.patient.BasePatientFamilyMemberDao;
//import com.yihu.jw.entity.base.patient.BasePatientDO;
//import com.yihu.jw.entity.base.patient.BasePatientFamilyMemberDO;
//import com.yihu.jw.patient.dao.BasePatientDao;
//import com.yihu.jw.patient.dict.BasePatientDao;
//import com.yihu.jw.restmodel.web.Envelop;
//import com.yihu.jw.util.idcard.IdCardUtil;
//import com.yihu.mysql.query.BaseJpaService;

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasDefaultModuleFunctionService.java

@@ -1,7 +1,7 @@
//package com.yihu.jw.base.service.saas;
//
//import com.yihu.jw.base.dao.saas.SaasDefaultModuleFunctionDao;
//import com.yihu.jw.base.dao.saas.SaasTypeDictDao;
//import com.yihu.jw.base.dict.saas.SaasDefaultModuleFunctionDao;
//import com.yihu.jw.base.dict.saas.SaasTypeDictDao;
//import com.yihu.jw.entity.base.saas.SaasDefaultModuleFunctionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.beans.factory.annotation.Autowired;

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasModuleFunctionService.java

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.saas;
//
//import com.yihu.jw.base.dao.saas.SaasModuleFunctionDao;
//import com.yihu.jw.base.dict.saas.SaasModuleFunctionDao;
//import com.yihu.jw.entity.base.saas.SaasModuleFunctionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/version/AppVersionService.java

@@ -1,6 +1,6 @@
//package com.yihu.jw.base.service.version;
//
//import com.yihu.jw.base.dao.version.AppVersionDao;
//import com.yihu.jw.base.dict.version.AppVersionDao;
//import com.yihu.jw.entity.base.version.AppVersionDO;
//import com.yihu.mysql.query.BaseJpaService;
//import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WxAccessTokenService.java

@@ -5,8 +5,8 @@
//import com.yihu.jw.exception.ApiException;
//import com.yihu.jw.exception.code.ExceptionCode;
//import com.yihu.jw.rm.base.WechatRequestMapping;
//import com.yihu.jw.wechat.dao.WechatDao;
//import com.yihu.jw.wechat.dao.WxAccessTokenDao;
//import com.yihu.jw.wechat.dict.WechatDao;
//import com.yihu.jw.wechat.dict.WxAccessTokenDao;
//import com.yihu.mysql.query.BaseJpaService;
//import com.yihu.utils.network.HttpUtils;
//import org.json.JSONObject;

svr/svr-base/src/main/java/com/yihu/jw/base/service/wx/WxGraphicMessageService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.base.service.wx;//package com.yihu.jw.business.wx.service;
//
//import com.yihu.jw.base.wx.WxGraphicMessageDO;
//import com.yihu.jw.business.wx.dao.WxGraphicMessageDao;
//import com.yihu.jw.business.wx.dict.WxGraphicMessageDao;
//import com.yihu.jw.exception.ApiException;
//import com.yihu.jw.exception.code.ExceptionCode;
//import com.yihu.base.mysql.query.BaseJpaService;

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/config/jpa/WlyyHouseJpa.java

@@ -25,7 +25,7 @@
//@EnableJpaRepositories(
//        entityManagerFactoryRef = "wlyyHouseEntityManagerFactory",
//        transactionManagerRef = "wlyyHouseTransactionManager",
//        basePackages = {"com.yihu.jw.healthyhouse.dao"})   //设置Repository所在位置
//        basePackages = {"com.yihu.jw.healthyhouse.dict"})   //设置Repository所在位置
//public class WlyyHouseJpa {
//
//    @Autowired

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/facility/FacilityServerRelationDao.java

@@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Modifying;
import java.util.List;
/**
 * 设施与服务关系 dao
 * 设施与服务关系 dict
 * @author zdm
 * @version 1.0
 * @created 2018.09.20

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/FacilityUsedRecordDao.java

@@ -4,7 +4,7 @@ import com.yihu.jw.healthyhouse.model.user.FacilityUsedRecord;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 用户导航记录 dao
 * 用户导航记录 dict
 * @author zdm
 * @version 1.0
 * @created 2018.09.21

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceQualityInspectionPlanDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotDeviceSimDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotPatientDeviceDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.device;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import org.springframework.data.domain.Pageable;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/dao/IotSystemDictDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.repository.dao;
package com.yihu.jw.repository.dict;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/DeviceQualityPlanService.java

@@ -4,9 +4,8 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.repository.message.IotMessageDao;
import com.yihu.jw.repository.service.IotDeviceQualityInspectionPlanService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotDeviceQualityInspectionPlanService.java

@@ -1,17 +1,7 @@
package com.yihu.jw.repository.service;
import com.alibaba.fastjson.JSONObject;
package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceQualityInspectionPlanDO;
import com.yihu.jw.entity.iot.device.IotOrderPurchaseDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotDeviceDao;
import com.yihu.jw.repository.dao.IotDeviceQualityInspectionPlanDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.restmodel.iot.device.IotDeviceQualityInspectionPlanVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.repository.device.IotDeviceQualityInspectionPlanDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +12,6 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * @author yeshijie on 2017/12/8.
@@ -44,7 +33,7 @@ public class IotDeviceQualityInspectionPlanService extends BaseJpaService<IotDev
     */
    public List<IotDeviceQualityInspectionPlanDO>  findListAll(String time){
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1");
        StringBuffer sql = new StringBuffer("SELECT c.* FROM  iot_device_quality_inspection_plan c WHERE del=1 and c.status=1 ");
        List<Object> args = new ArrayList<>();
        if (StringUtils.isNotBlank(time)){

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotDeviceSimService.java

@@ -1,14 +1,14 @@
package com.yihu.jw.repository.service;
package com.yihu.jw.service.device;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.iot.device.IotDeviceDO;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.device.IotPatientDeviceDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotDeviceDao;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.dao.IotPatientDeviceDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.device.IotDeviceDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import com.yihu.jw.repository.device.IotPatientDeviceDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.restmodel.iot.device.IotOrderVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.rm.iot.IotRequestMapping;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/SimBalanceService.java

@@ -4,10 +4,9 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.entity.iot.message.IotMessageDO;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.jw.repository.message.IotMessageDao;
import com.yihu.jw.repository.service.IotDeviceSimService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/service/device/SimSetMealService.java

@@ -2,7 +2,7 @@ package com.yihu.jw.service.device;
import com.yihu.jw.entity.iot.device.IotDeviceSimDO;
import com.yihu.jw.repository.dao.IotDeviceSimDao;
import com.yihu.jw.repository.device.IotDeviceSimDao;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-iot-job/src/main/java/com/yihu/jw/repository/service/IotSystemDictService.java

@@ -1,12 +1,10 @@
package com.yihu.jw.repository.service;
package com.yihu.jw.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.repository.dao.IotSystemDictDao;
import com.yihu.jw.repository.dict.IotSystemDictDao;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.DataAccessException;
import org.springframework.jdbc.core.ResultSetExtractor;
import org.springframework.stereotype.Service;

svr/svr-iot-job/src/main/java/com/yihu/jw/web/quota/JobController.java

@@ -76,7 +76,7 @@ public class JobController extends BaseController {
    @RequestMapping(value = "unSettledHISPrescription", method = RequestMethod.GET)
    public String unSettledHISPrescription() {
        try {
            simSetMealService.autoPush();
            deviceQualityPlanService.autoPush();
            return success("成功！");
        } catch (Exception e) {
            error(e);

svr/svr-iot/src/main/java/com/yihu/iot/config/jpa/IotJpa.java

@@ -26,7 +26,7 @@
//@EnableJpaRepositories(
//        entityManagerFactoryRef = "iotEntityManagerFactory",
//        transactionManagerRef = "iotTransactionManager",
//        basePackages = {"com.yihu.iot.dao","com.yihu.iot.datainput.dao"})   //设置Repository所在位置
//        basePackages = {"com.yihu.iot.dict","com.yihu.iot.datainput.dict"})   //设置Repository所在位置
//public class IotJpa {
//
//    @Autowired

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

@@ -42,26 +42,6 @@ public class IotSystemDictController extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = IotRequestMapping.System.getListByParentCode)
    @ApiOperation(value = "查询子类字典")
    public MixEnvelop<JSONObject, JSONObject> getListByParentCode(
            @ApiParam(name = "parentCode", value = "父类字典id", defaultValue = "402803f271b9583b0171b95b34e10001")
            @RequestParam(value = "parentCode", required = true) String parentCode) throws Exception {
        try {
            List<JSONObject> doList = null;
            if(StringUtils.isNoneBlank(parentCode)){
                doList = iotSystemDictService.getListByParentCode("'"+parentCode.replace(",","','")+"'");
            }else{
                doList= iotSystemDictService.getListByParentCode();
            }
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_find_functions,doList);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
        }
    }
    @PostMapping(value = IotRequestMapping.System.createDict)
    @ApiOperation(value = "创建字典", notes = "创建字典")
@@ -70,7 +50,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/controller/monitorPlatform/MonitorPlatformController.java

@@ -2,7 +2,10 @@ package com.yihu.iot.controller.monitorPlatform;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.iot.service.dict.IotSystemDictService;
import com.yihu.iot.service.monitorPlatform.MonitorPlatformService;
import com.yihu.iot.service.product.IotProductBaseInfoService;
import com.yihu.jw.entity.iot.dict.IotSystemDictDO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.iot.IotRequestMapping;
@@ -10,10 +13,12 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import iot.device.LocationDataVO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@@ -26,7 +31,61 @@ public class MonitorPlatformController extends EnvelopRestEndpoint {
    @Autowired
    private MonitorPlatformService monitorPlatformService;
    @Autowired
    private IotSystemDictService iotSystemDictService;
    @Autowired
    private IotProductBaseInfoService iotProductBaseInfoService;
    @GetMapping(value = IotRequestMapping.System.findDictByCode)
    @ApiOperation(value = "获取字典列表(不分页)")
    public MixEnvelop<IotSystemDictDO, IotSystemDictDO> getList(
            @ApiParam(name = "dictName", value = "字典名称", defaultValue = "COMPANY_TYPE")
            @RequestParam(value = "dictName", required = true) String dictName) throws Exception {
        try {
            List<IotSystemDictDO> doList = iotSystemDictService.getListByDictName(dictName);
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_find_functions,doList);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
        }
    }
    @GetMapping(value = IotRequestMapping.Product.findListByCategoryCode)
    @ApiOperation(value = "根据分类查找产品信息")
    public MixEnvelop<JSONObject, JSONObject> findListByCategoryCode(@ApiParam(name = "categoryCode", value = "分类code", defaultValue = "1")
                                                                     @RequestParam(value = "categoryCode", required = true)String categoryCode) {
        try {
            if(org.apache.commons.lang.StringUtils.isBlank(categoryCode)){
                return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, iotProductBaseInfoService.findListByCategoryCode());
            }else {
                return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, iotProductBaseInfoService.findListByCategoryCode("'"+categoryCode.replace(",","','")+"'"));
            }
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError(e.getMessage());
        }
    }
    @GetMapping(value = IotRequestMapping.System.getListByParentCode)
    @ApiOperation(value = "查询子类字典")
    public MixEnvelop<JSONObject, JSONObject> getListByParentCode(
            @ApiParam(name = "parentCode", value = "父类字典id", defaultValue = "402803f271b9583b0171b95b34e10001")
            @RequestParam(value = "parentCode", required = true) String parentCode) throws Exception {
        try {
            List<JSONObject> doList = null;
            if(StringUtils.isNoneBlank(parentCode)){
                doList = iotSystemDictService.getListByParentCode("'"+parentCode.replace(",","','")+"'");
            }else{
                doList= iotSystemDictService.getListByParentCode();
            }
            return MixEnvelop.getSuccessList(IotRequestMapping.Company.message_success_find_functions,doList);
        }catch (Exception e){
            e.printStackTrace();
            return MixEnvelop.getError("查询失败");
        }
    }
    @RequestMapping(value = "/areaDict",method = RequestMethod.GET)
    @ApiOperation("地区字典")

svr/svr-iot/src/main/java/com/yihu/iot/controller/product/IotProductController.java

@@ -224,21 +224,5 @@ public class IotProductController extends EnvelopRestEndpoint {
        return iotProductBaseInfoService.findAll();
    }
    @GetMapping(value = IotRequestMapping.Product.findListByCategoryCode)
    @ApiOperation(value = "根据分类查找产品信息")
    public MixEnvelop<JSONObject, JSONObject> findListByCategoryCode(@ApiParam(name = "categoryCode", value = "分类code", defaultValue = "1")
                                                              @RequestParam(value = "categoryCode", required = true)String categoryCode) {
        try {
            if(StringUtils.isBlank(categoryCode)){
                return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, iotProductBaseInfoService.findListByCategoryCode());
            }else {
                return MixEnvelop.getSuccess(IotRequestMapping.Common.message_success_find, iotProductBaseInfoService.findListByCategoryCode("'"+categoryCode.replace(",","','")+"'"));
            }
       }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

@@ -494,7 +494,7 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
                list.add(vo);
            });
        }
        company.setAppList(appList);
        company.setAppList(list);
    }
    /**
@@ -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("审核操作成功");
    }
@@ -786,6 +795,13 @@ public class IotCompanyService extends BaseJpaService<IotCompanyDO,IotCompanyDao
    public MixEnvelop<IotCompanyVO, IotCompanyVO> findCompanyByAccount() {
        IotCompanyDO companyDO = iotCompanyDao.findByEhrUserId(userAgent.getUID());
        if (companyDO.getAccountType().equalsIgnoreCase("0")){
            List<IotCompanyAppDO> appDOList = iotCompanyAppDao.findByCompanyId(companyDO.getId());
            companyDO.setAppList(appDOList);
        }
        if (companyDO.getAccountType().equalsIgnoreCase("1")){
            findType(companyDO);
        }
        IotCompanyVO companyVO = convertToModelVO(companyDO);
        if (companyDO==null){
            return MixEnvelop.getSuccess("未入驻企业",-1);

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,7 +4,12 @@ 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.iot.dict.IotSystemDictVO;
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;
@@ -39,9 +44,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);
@@ -63,7 +73,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);
    }
    /**

svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/jpa/WlyyJpa.java

@@ -26,7 +26,7 @@ import javax.sql.DataSource;
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager",
        basePackages = {"com.yihu.wlyy.statistics.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.wlyy.statistics.dict"})   //设置Repository所在位置
public class WlyyJpa {
    @Autowired

svr/svr-wlyy-archives/src/main/java/com/yihu/jw/config/jpa/WlyyArchivesJpa.java

@@ -25,7 +25,7 @@ import java.util.Properties;
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyArchivesEntityManagerFactory",
        transactionManagerRef = "wlyyArchivesTransactionManager",
        basePackages = {"com.yihu.jw.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.jw.dict"})   //设置Repository所在位置
public class WlyyArchivesJpa {
    @Autowired

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/AccountDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:15
 * @desc health bank account dao
 * @desc health bank account dict
 **/
public interface AccountDao extends PagingAndSortingRepository<AccountDO,String>,JpaSpecificationExecutor<AccountDO> {
    @Query("select t from AccountDO t where t.patientId=?1 and t.status=1")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ActiveRecordDao.java

@@ -9,7 +9,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:15
 * @desc health bank account dao
 * @desc health bank account dict
 **/
public interface ActiveRecordDao extends PagingAndSortingRepository<ActiveRecordDO,String>,JpaSpecificationExecutor<ActiveRecordDO> {

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/ExchangeGoodsDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-03 15:28
 * @desc exchange goods dao
 * @desc exchange goods dict
 **/
public interface ExchangeGoodsDao extends PagingAndSortingRepository<ExchangeGoodsDO,String>,JpaSpecificationExecutor<ExchangeGoodsDO> {
    @Query("select t from ExchangeGoodsDO t where t.activityGoodsId = ?1 and t.patientId = ?2")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskDao.java

@@ -14,7 +14,7 @@ import java.util.List;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:17
 * @desc health bank task dao
 * @desc health bank task dict
 **/
public interface TaskDao extends PagingAndSortingRepository<TaskDO,String>,JpaSpecificationExecutor<TaskDO> {
    @Query("select t from TaskDO t where t.transactionId = ?1 and t.type='ACTIVITY_TASK'")

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskGoodsDao.java

@@ -14,7 +14,7 @@ import java.util.List;
/**
 * @author wangzhinan
 * @create 2018-06-08 15:28
 * @desc 商品 dao
 * @desc 商品 dict
 **/
public interface TaskGoodsDao extends PagingAndSortingRepository<TaskGoodsDO,String>,JpaSpecificationExecutor<TaskGoodsDO> {

svr/svr-wlyy-health-bank/src/main/java/com/yihu/jw/dao/TaskRuleDao.java

@@ -11,7 +11,7 @@ import org.springframework.data.repository.PagingAndSortingRepository;
/**
 * @author wangzhinan
 * @create 2018-05-10 11:17
 * @desc health bank task dao
 * @desc health bank task dict
 **/
public interface TaskRuleDao extends PagingAndSortingRepository<TaskRuleDO,String>,JpaSpecificationExecutor<TaskRuleDO> {
    @Query("select t from TaskRuleDO t where t.id = ?1 and t.status=1")

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/PatientLabelDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.PatientLabelDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/PatientLabelInfoDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.PatientLabelDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/SpecialistArticleDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistArticleDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/SpecialistConsultDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistConsultDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/SpecialistDao.java

@@ -1,4 +1,4 @@
//package com.yihu.jw.dao;
//package com.yihu.jw.dict;
//
//import com.yihu.jw.entity.specialist.SpecialistDO;
//import org.springframework.data.jpa.repository.JpaSpecificationExecutor;