角色-菜单

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

@@ -6,15 +6,18 @@ 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.base.user.UserDO;
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;
import com.yihu.jw.user.UserDao;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang3.StringUtils;
import org.jsoup.Connection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,17 +43,30 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private UserDao userDao;
    @Value("${wechat.id}")
    private String wechatId;
    /**
     * 创建和修改应用菜单实体
     *
     * @param menuDO
     * @return
     */
    public BaseApplicationMenuDO insertAndUpdateMenu(BaseApplicationMenuDO menuDO){
    public BaseApplicationMenuDO insertAndUpdateMenu(BaseApplicationMenuDO menuDO,String uuid){
        UserDO userDO = userDao.findById(uuid).get();
        if (StringUtils.isNoneBlank(menuDO.getId())){
            menuDO.setUpdateTime(new Date());
            menuDO.setUpdateUser(uuid);
            menuDO.setUpdateUserName(userDO.getName());
        }else {
            menuDO.setCreateTime(new Date());
            menuDO.setCreateUser(uuid);
            menuDO.setCreateUserName(userDO.getName());
            menuDO.setUpdateUser(uuid);
            menuDO.setUpdateTime(new Date());
            menuDO.setUpdateUserName(userDO.getName());
        }
        return applicationMenuDao.save(menuDO);
    }
@@ -112,6 +128,12 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
     */
    public MixEnvelop selectByCondition(String type,String saasId, String orgCode, String name, Integer status, Integer page, Integer size){
        MixEnvelop mixEnvelop = new MixEnvelop();
        String conditionSql = "";
        if ("xm_ykyy_wx".equals(wechatId)) {
            conditionSql = "to_char(m.update_time,'YYYY-MM-DD hh24:mi:ss')  AS \"updateTime\",";
        } else {
            conditionSql = "date_format(m.update_time,'%Y-%m-%d %H:%i:%S' )  AS \"updateTime\",";
        }
        String sql = "SELECT\n" +
                "\tm.id,\n" +
                "\tm. CODE AS \"code\",\n" +
@@ -119,6 +141,7 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
                "\tm.saas_id AS \"saasId\",\n" +
                "\ts. NAME AS \"saasName\",\n" +
                "\tm.org_code AS \"orgCode\",\n" +
                "\to.name AS \"orgName\",\n" +
                "\tm.identify AS \"identify\",\n" +
                "\tm.parent_id AS \"parentId\",\n" +
                "\tm.menu_sort AS \"menuSort\",\n" +
@@ -128,7 +151,9 @@ public class BaseApplicationMenuService extends BaseJpaService<BaseApplicationMe
                "\tm.url AS \"url\",\n" +
                "\tm.url_param AS \"urlParam\",\n" +
                "\tm.description AS \"description\",\n" +
                "\tm.create_time AS \"createTime\"\n" +
                conditionSql +
                "\tm.update_user_name AS \"updateUserName\"\n" +
                "FROM\n" +
                "\tbase_application_menu m\n" +
                "LEFT JOIN base_saas s ON s.id = m.saas_id\n" +

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

@@ -9,10 +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.base.user.UserDO;
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.user.UserDao;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import jdk.nashorn.internal.ir.IfNode;
import org.apache.commons.lang3.StringUtils;
@@ -44,6 +46,8 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
    private BaseApplicationRoleUserDao applicationRoleUserDao;
    @Autowired
    private WlyyHospitalSysDictDao hospitalSysDictDao;
    @Autowired
    private UserDao userDao;
    /**
     * 创建和修改应用角色
@@ -51,10 +55,18 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
     * @param roleDictDO
     * @return
     */
    public BaseApplicationRoleDictDO insertAndUpdateRole(BaseApplicationRoleDictDO roleDictDO){
    public BaseApplicationRoleDictDO insertAndUpdateRole(BaseApplicationRoleDictDO roleDictDO,String uuid){
        UserDO userDO = userDao.findById(uuid).get();
        if (StringUtils.isNoneBlank(roleDictDO.getId())){
            roleDictDO.setUpdateUser(uuid);
            roleDictDO.setUpdateUserName(userDO.getName());
            roleDictDO.setUpdateTime(new Date());
        }else {
            roleDictDO.setUpdateTime(new Date());
            roleDictDO.setUpdateUser(uuid);
            roleDictDO.setUpdateUserName(userDO.getName());
            roleDictDO.setCreateUser(uuid);
            roleDictDO.setCreateUserName(userDO.getName());
            roleDictDO.setCreateTime(new Date());
        }
        return applicationRoleDictDao.save(roleDictDO);
@@ -104,7 +116,8 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
                "\tm.type AS \"type\",\n" +
                "\tm.name AS \"name\",\n" +
                "\tm.STATUS AS \"status\",\n" +
                "\tm.create_time AS \"createTime\"\n" +
                "\tm.update_time AS \"updateTime\",\n" +
                "\tm.update_user_name AS \"updateUserName\"\n" +
                "FROM\n" +
                "\tbase_application_role_dict m\n" +
                "LEFT JOIN base_saas s ON s.id = m.saas_id\n" +

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

@@ -37,7 +37,7 @@ private BaseApplicationMenuService applicationMenuService;
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestParam(value = "jsonData") String jsonData) throws Exception {
            BaseApplicationMenuDO menuDO = toEntity(jsonData, BaseApplicationMenuDO.class);
            menuDO = applicationMenuService.insertAndUpdateMenu(menuDO);
            menuDO = applicationMenuService.insertAndUpdateMenu(menuDO,getUID());
            return success(menuDO);
    }

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

@@ -41,7 +41,7 @@ private BaseApplicationRoleDictService applicationRoleDictService;
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestParam(value = "jsonData") String jsonData) throws Exception {
        BaseApplicationRoleDictDO roleDictDO = toEntity(jsonData, BaseApplicationRoleDictDO.class);
        roleDictDO = applicationRoleDictService.insertAndUpdateRole(roleDictDO);
        roleDictDO = applicationRoleDictService.insertAndUpdateRole(roleDictDO,getUID());
        return success(roleDictDO);
    }