新增、修改字典接口变更

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

@@ -140,6 +140,7 @@ public class BaseRequestMapping {
        public static final String ALL  = "/query_all";
        public static final String QUERY_BY_SAASID = "/queryBySaasId";
        public static final String QUERY_BY_TYPE  = "/query_by_type";
        public static final String CREATE_BY_TYPE = "/createByType";
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/notice/UserNoticeEndpoint.java

@@ -41,14 +41,15 @@ public class UserNoticeEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.Module.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<UserNoticeVO> page (
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
    public PageEnvelop<UserNoticeVO> page(
//            @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 {
        return userNoticeService.queryPage(page,size,userId);
        String userId = getUID();
        return userNoticeService.queryPage(page, size, userId);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/system/SystemDictEndpoint.java

@@ -154,4 +154,19 @@ public class SystemDictEndpoint extends EnvelopRestEndpoint {
        JSONArray list = systemDictService.getDistListByType(type, userId, sorts, page, size);
        return success(list);
    }
    @PostMapping(value = BaseRequestMapping.SystemDict.CREATE_BY_TYPE)
    @ApiOperation(value = "根据不同的类型创建字典")
    public Envelop createAndUpdate(
            @ApiParam(name = "dictType", value = "字典类型", required = true)
            @RequestParam(value = "dictType") String dictType,
            @ApiParam(name = "jsonData", value = "字典Json数据", required = true)
            @RequestParam(value = "jsonData") String jsonData) throws Exception {
        JSONObject result =  systemDictService.createDictByType(dictType,jsonData);
        if(StringUtils.equalsIgnoreCase(ConstantUtils.FAIL,result.getString("response"))){
            return failed(result.getString("msg"));
        }
        return success(result.getJSONArray("msg"));
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/system/SystemDictService.java

@@ -7,6 +7,7 @@ import com.yihu.jw.base.dao.system.SystemDictDao;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.base.service.dict.*;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.entity.base.dict.*;
import com.yihu.jw.entity.base.system.SystemDictDO;
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
import com.yihu.mysql.query.BaseJpaService;
@@ -259,4 +260,59 @@ public class SystemDictService extends BaseJpaService<SystemDictDO, SystemDictDa
        result.put("msg",list);
        return result;
    }
    /**
     * 查询字典分页信息
     * @param type
     * @param json
     * @return
     */
    public JSONObject createDictByType(String type,String json) throws ParseException {
        JSONObject result = new JSONObject();
        if (StringUtils.isEmpty(json) || StringUtils.isEmpty(json)) {
            result.put("msg","parameter dictType or userId is null");
            result.put("response",ConstantUtils.FAIL);
            return result;
        }
        List list = new ArrayList();
        long count = 0;
        if (SystemDictEnum.Icd10Dict == SystemDictEnum.valueOf(type)) {
            DictIcd10DO dictIcd10DO=convertToModel(json,DictIcd10DO.class);
            dictIcd10DO.setSaasId(saasId);
            dictIcd10Service.save(dictIcd10DO);
        } else if (SystemDictEnum.HospitalDeptDict == SystemDictEnum.valueOf(type)) {
            //科室只与机构有关。
            DictHospitalDeptDO dictHospitalDeptDO=convertToModel(json,DictHospitalDeptDO.class);
            dictHospitalDeptService.save(dictHospitalDeptDO);
        } else if (SystemDictEnum.JobTitleDict == SystemDictEnum.valueOf(type)) {
            DictJobTitleDO dictJobTitleDO=convertToModel(json,DictJobTitleDO.class);
            dictJobTitleDO.setSaasId(saasId);
            dictJobTitleService.save(dictJobTitleDO);
        } else if (SystemDictEnum.HealthProblemDict == SystemDictEnum.valueOf(type)) {
            DictHealthProblemDO dictHealthProblemDO=convertToModel(json,DictHealthProblemDO.class);
            dictHealthProblemDO.setSaasId(saasId);
            dictHealthProblemService.save(dictHealthProblemDO);
        } else if (SystemDictEnum.MedicineDict == SystemDictEnum.valueOf(type)) {
            DictMedicineDO dictMedicineDO=convertToModel(json,DictMedicineDO.class);
            dictMedicineDO.setSaasId(saasId);
            dictMedicineService.save(dictMedicineDO);
        } else if (SystemDictEnum.DiseaseDict == SystemDictEnum.valueOf(type)) {
            DictDiseaseDO dictDiseaseDO=convertToModel(json,DictDiseaseDO.class);
            dictDiseaseDO.setSaasId(saasId);
            dictDiseaseService.save(dictDiseaseDO);
        }else{
            SystemDictDO systemDictDO=convertToModel(json,SystemDictDO.class);
            systemDictDO.setSaasId(saasId);
            this.save(systemDictDO);
        }
        result.put("response",ConstantUtils.SUCCESS);
        result.put("count",count);
        result.put("msg",list);
        return result;
    }
}