角色-菜单

business/base-service/src/main/java/com/yihu/jw/application/service/BaseApplicationMenuService.java

@@ -6,6 +6,8 @@ import com.yihu.jw.application.dao.BaseApplicationMenuDao;
import com.yihu.jw.application.dao.BaseApplicationRoleMenuDao;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.application.BaseApplicationMenuDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.base.role.MenuVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -14,6 +16,7 @@ import org.apache.commons.lang3.StringUtils;
import org.jsoup.Connection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.persistence.criteria.CriteriaBuilder;
import java.util.ArrayList;
@@ -26,6 +29,7 @@ import java.util.stream.Collectors;
 * 应用菜单资源配置
 */
@Service
@Transactional
public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMenuDO, BaseApplicationMenuDao> {
    @Autowired
@@ -33,6 +37,9 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
    @Autowired
    private HibenateUtils hibenateUtils;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    /**
     * 创建和修改应用菜单实体
     *
@@ -50,10 +57,13 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
    /**
     * 根据id删除菜单实体
     * @param id
     * @param ids
     */
    public void deleteById(String id){
        applicationMenuDao.deleteById(id);
    public void deleteById(String ids){
        String str[]= ids.split(",");
        for (int i=0;i<str.length;i++){
            applicationMenuDao.deleteById(str[i]);
        }
    }
@@ -149,6 +159,25 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
        String orderCondition = " order by m.create_time desc ";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql+condition+orderCondition,page,size);
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("V_APPLICATION_ROLE_DICT").get();
        JSONObject object = new JSONObject();
        if (hospitalSysDictDO!=null){
            object = JSONObject.parseObject(hospitalSysDictDO.getDictValue());
        }
        WlyyHospitalSysDictDO hospitalSysDictDO1 = hospitalSysDictDao.findById("V_APPLICATION_IDENTIFY").get();
        JSONObject jsonObject = new JSONObject();
        if (hospitalSysDictDO1!=null){
            jsonObject = JSONObject.parseObject(hospitalSysDictDO1.getDictValue());
        }
        if (hospitalSysDictDO!=null)
            for (Map<String,Object> map:list){
                String typeId = map.get("type").toString();
                String typeName= object.getString(typeId);
                map.put("typeName",typeName);
                String identify = map.get("identify").toString();
                String identifyName = jsonObject.getString(identify);
                map.put("identifyName",identifyName);
            }
        Long count = 0L;
        List<Map<String,Object>> total = hibenateUtils.createSQLQuery(sqlTotal+condition);
        if(total!=null){

business/base-service/src/main/java/com/yihu/jw/application/service/BaseApplicationRoleDictService.java

@@ -1,5 +1,6 @@
package com.yihu.jw.application.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.application.dao.BaseApplicationMenuDao;
import com.yihu.jw.application.dao.BaseApplicationRoleDictDao;
import com.yihu.jw.application.dao.BaseApplicationRoleMenuDao;
@@ -8,9 +9,12 @@ import com.yihu.jw.entity.base.application.BaseApplicationMenuDO;
import com.yihu.jw.entity.base.application.BaseApplicationRoleDictDO;
import com.yihu.jw.entity.base.application.BaseApplicationRoleMenuDO;
import com.yihu.jw.entity.base.application.BaseApplicationRoleUserDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import jdk.nashorn.internal.ir.IfNode;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -38,6 +42,8 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
    @Autowired
    private BaseApplicationRoleUserDao applicationRoleUserDao;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    /**
     * 创建和修改应用角色
@@ -56,10 +62,13 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
    /**
     * 根据id删除应用角色
     * @param id
     * @param ids
     */
    public void deleteById(String id){
        applicationRoleDictDao.deleteById(id);
    public void deleteById(String ids){
        String str[]= ids.split(",");
        for (int i=0;i<str.length;i++){
            applicationRoleDictDao.deleteById(str[i]);
        }
    }
@@ -93,6 +102,7 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
                "\tm.org_code AS \"orgCode\",\n" +
                "\to.name as \"orgName\",\n" +
                "\tm.type AS \"type\",\n" +
                "\tm.name AS \"name\",\n" +
                "\tm.STATUS AS \"status\",\n" +
                "\tm.create_time AS \"createTime\"\n" +
                "FROM\n" +
@@ -125,6 +135,17 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
        String orderCondition = " order by m.create_time desc ";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql+condition+orderCondition,page,size);
        WlyyHospitalSysDictDO hospitalSysDictDO = hospitalSysDictDao.findById("V_APPLICATION_ROLE_DICT").get();
        JSONObject object = new JSONObject();
        if (hospitalSysDictDO!=null){
            object = JSONObject.parseObject(hospitalSysDictDO.getDictValue());
        }
        if (hospitalSysDictDO!=null)
        for (Map<String,Object> map:list){
            String typeId = map.get("type").toString();
            String typeName= object.getString(typeId);
            map.put("typeName",typeName);
        }
        Long count = 0L;
        List<Map<String,Object>> total = hibenateUtils.createSQLQuery(sqlTotal+condition);
        if(total!=null){

svr/svr-base/src/main/java/com/yihu/SvrBaseApplication.java

@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.web.client.RestTemplate;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
import javax.servlet.MultipartConfigElement;

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/application/BaseApplicationMenuEndpoint.java

@@ -45,7 +45,7 @@ private BaseApplicationMenuService applicationMenuService;
    @ApiOperation(value = "根据id删除菜单实体")
    public Envelop delete(@ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
        @RequestParam(value = "ids") String ids) {
        applicationMenuService.delete(ids.split(","));
        applicationMenuService.deleteById(ids);
        return success("删除成功");
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/application/BaseApplicationRoleDictEndpoint.java

@@ -49,7 +49,7 @@ private BaseApplicationRoleDictService applicationRoleDictService;
    @ApiOperation(value = "根据id删除应用角色")
    public Envelop delete(@ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
        @RequestParam(value = "ids") String ids) {
        applicationRoleDictService.delete(ids.split(","));
        applicationRoleDictService.deleteById(ids);
        return success("删除成功");
    }

svr/svr-base/src/main/resources/application.yml

@@ -99,6 +99,11 @@ minio:
  accessKey: minio@admin
  secretKey: minio@admin
  bucket: image
swagger:
  basic:
    enable: true
    username: jw
    password: jkzl
---
spring:
  profiles: jwdev
@@ -1031,6 +1036,10 @@ fastDFS:
  fastdfs_file_url: http://10.172.0.61:80/
demo:
  flag: true
basedb: #base数据基础数据数据源，用于跨库查询
  name: base
base:
  url: http://172.17.110.212:10020/
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL