Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-06-02 a52b9c0e0f708b36d35dbc95c591645d249d7db7

Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

 screen-manage/src/main/java/com/moral/api/controller/ManageMenuController.java

@@ -121,17 +121,12 @@
    public ResultMessage getManageMenuByNameFuzzy(HttpServletRequest request) {
        Map<String,Object> parameters = getParametersStartingWith(request,null);
        Map<String,Object> resultMap = new HashMap<>();
        if (parameters.get("name") == null || parameters.get("current") == null || parameters.get("size") == null){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return ResultMessage.fail(resultMap);
        }
        if (Integer.parseInt(parameters.get("current").toString())<1 || Integer.parseInt(parameters.get("size").toString())<1){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
            return ResultMessage.fail(resultMap);
        }
        List<Map<String,Object>> re = manageMenuService.getManageMenuByNameFuzzy(parameters);
        Map<String,Object> re = manageMenuService.getManageMenuByCondition(parameters);
        return ResultMessage.ok(re);
    }

@@ -192,4 +187,12 @@
        List<ManageMenu> result = manageMenuService.getManageChildMenuByRoleId(Integer.parseInt(parameters.get("roleId").toString()));
        return ResultMessage.ok(result);
    }

    @ApiOperation(value = "查询所有父菜单", notes = "查询所有父菜单")
    @RequestMapping(value = "getManageParentMenu", method = RequestMethod.GET)
    public ResultMessage getManageParentMenu(HttpServletRequest request) {
        Map<String, Object> parameters = getParametersStartingWith(request, null);
        Map<String,Object> result = manageMenuService.getManageParentMenu(parameters);
        return ResultMessage.ok(result);
    }
}

 screen-manage/src/main/java/com/moral/api/entity/ManageMenu.java

@@ -57,6 +57,7 @@
    /**
     * 同一级别菜单的顺序
     */
    @TableField(value = "`order`")
    private Integer order;

    /**

 screen-manage/src/main/java/com/moral/api/mapper/ManageMenuMapper.java

@@ -34,6 +34,8 @@

    List<ManageMenu> getManageRoleByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByNameFuzzy(Map map);

    List<ManageMenu> getManageMenuByCondition(Map map);

    List<ManageMenu> getManageMenuByRoleId(int roleId);

 screen-manage/src/main/java/com/moral/api/service/ManageMenuService.java

@@ -38,6 +38,10 @@

    List<Map<String,Object>> getManageMenuByNameFuzzy(Map map);

    Map<String,Object> getManageMenuByCondition(Map map);

    Map<String,Object> getManageParentMenu(Map map);

    List<Map<String,Object>> getManageMenuByParentId(Map map);

    List<ManageMenu> getParentChildrenMenusByRoles(List<ManageRole> roles);

 screen-manage/src/main/java/com/moral/api/service/impl/ManageMenuServiceImpl.java

@@ -85,6 +85,11 @@
            resultMap.put("code", ResponseCodeEnum.MENU_IS_NULL.getCode());
            resultMap.put("msg", ResponseCodeEnum.MENU_IS_NULL.getMsg());
        } else {
            if (map.get("name")!=null && manageMenuMapper.getManageMenuByName(map.get("name").toString()) != null) {
                resultMap.put("code", ResponseCodeEnum.MENU_IS_EXIST.getCode());
                resultMap.put("msg", ResponseCodeEnum.MENU_IS_EXIST.getMsg());
                return resultMap;
            }
            //更新之前获取原来的菜单信息
            ManageMenu manageMenuOld = manageMenuMapper.getManageMenuById(Integer.parseInt(map.get("id").toString()));
            manageMenuMapper.updateManageMenuById(map);
@@ -237,10 +242,15 @@
    @Override
    public List<Map<String,Object>> getManageMenuByNameFuzzy(Map map) {
        Map limitMap = new HashMap();
        if(!ObjectUtils.isEmpty(map.get("name"))){
        limitMap.put("name", map.get("name"));
        }
        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
            limitMap.put("parent_id", map.get("parent_id"));
        }
        limitMap.put("start", (Integer.parseInt(map.get("current").toString()) - 1) * Integer.parseInt(map.get("size").toString()));
        limitMap.put("number", Integer.parseInt(map.get("size").toString()));
        List<ManageMenu> manageMenus = manageMenuMapper.getManageRoleByNameFuzzy(limitMap);
        List<ManageMenu> manageMenus = manageMenuMapper.getManageMenuByNameFuzzy(limitMap);
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> resultList = new ArrayList<>();
        for (ManageMenu manageMenu:manageMenus) {
@@ -266,6 +276,67 @@
    }

    @Override
    public Map<String, Object> getManageMenuByCondition(Map map) {
        Map<String,Object> resultMap = new HashMap<>();
        int current = Integer.parseInt(map.get("current").toString());
        int size = Integer.parseInt(map.get("size").toString());
        Page<ManageMenu> page = new Page<>(current,size);
        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        if(!ObjectUtils.isEmpty(map.get("name"))){
            wrapper.like("name", map.get("name"));
        }
        if(!ObjectUtils.isEmpty(map.get("parent_id"))){
            wrapper.eq("parent_id", map.get("parent_id"));
        }
        Page resultpage = manageMenuMapper.selectPage(page,wrapper);
        List<ManageMenu> manageMenus = resultpage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
        List<Map<String,Object>> manageMenuList = new ArrayList<>();
        for (ManageMenu manageMenu:manageMenus) {
            Map manegeMenuMap = JSON.parseObject(JSON.toJSONString(manageMenu));
            if (manageMenu.getParentId().equals(0)){
                manegeMenuMap.put("parent_name","");
            }else {
                ManageMenu parentMenu = manageMenuMapper.getManageMenuById(manageMenu.getParentId());
                if (ObjectUtils.isEmpty(parentMenu)){
                    manegeMenuMap.put("parent_name","");
                }else {
                    String parent_name = parentMenu.getName();
                    manegeMenuMap.put("parent_name",parent_name);
                }
            }
            String createTime = SDF.format(manageMenu.getCreateTime());
            String updateTime = SDF.format(manageMenu.getUpdateTime());
            manegeMenuMap.put("createTime",createTime);
            manegeMenuMap.put("updateTime",updateTime);
            manageMenuList.add(manegeMenuMap);
        }
        resultMap.put("manageMenus",manageMenuList);
        int totalNumber = manageMenuMapper.selectCount(wrapper);
        resultMap.put("totalNumber",totalNumber);
        resultMap.put("current",current);
        resultMap.put("size",size);
        int totalPageNumber = totalNumber/size;
        if(totalNumber%size != 0){
            totalPageNumber += 1;
        }
        resultMap.put("totalPageNumber",totalPageNumber);
        return resultMap;
    }

    @Override
    public Map<String, Object> getManageParentMenu(Map map) {
        Map<String,Object> resultMap = new HashMap();
        QueryWrapper<ManageMenu> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",Constants.NOT_DELETE);
        wrapper.eq("parent_id",0);
        List<ManageMenu> manageMenus = manageMenuMapper.selectList(wrapper);
        resultMap.put("manageMenus",manageMenus);
        return resultMap;
    }

    @Override
    public List<Map<String, Object>> getManageMenuByParentId(Map map) {
        Map limitMap = new HashMap();
        limitMap.put("parent_id", map.get("parent_id"));

 screen-manage/src/main/java/com/moral/api/service/impl/ManageRoleServiceImpl.java

@@ -179,6 +179,7 @@
        QueryWrapper<ManageRole> wrapper = new QueryWrapper();
        wrapper.eq("is_delete",0);
        wrapper.like("name",map.get("name"));
        wrapper.orderByDesc("create_time");
        com.baomidou.mybatisplus.extension.plugins.pagination.Page resultpage = manageRoleMapper.selectPage(page,wrapper);
        List<ManageRole> manageRoles = resultpage.getRecords();
        SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");

 screen-manage/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java

@@ -6,13 +6,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.MonitorPoint;
import com.moral.api.entity.Organization;
import com.moral.api.entity.SysArea;
import com.moral.api.mapper.MonitorPointMapper;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.mapper.SysAreaMapper;
import com.moral.api.service.MonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -21,10 +24,7 @@

import javax.servlet.http.HttpServletRequest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * <p>
@@ -43,6 +43,9 @@

    @Autowired(required = false)
    private OrganizationMapper organizationMapper;

    @Autowired(required = false)
    private SysAreaMapper sysAreaMapper;

    @Autowired
    LogUtils logUtils;
@@ -115,6 +118,14 @@
            monitorPointMap.put("createTime",createTime);
            monitorPointMap.put("updateTime",updateTime);
            monitorPointMap.put("key",monitorPoint.getId());
            monitorPointMap.put("provinceCode",getAreaArr(monitorPointMap.get("provinceCode").toString()));
            monitorPointMap.put("cityCode",getAreaArr(monitorPointMap.get("cityCode").toString()));
            monitorPointMap.put("areaCode",getAreaArr(monitorPointMap.get("areaCode").toString()));
            Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
            if (!ObjectUtils.isEmpty(organization)) {
                String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                monitorPointMap.put("organizationId",organizationArr);
            }
            monitorPointtList.add(monitorPointMap);
        }
        resultMap.put("monitorPoints",monitorPointtList);
@@ -130,8 +141,12 @@

    @Override
    @Transactional
    public Map<String, Object> updateMonitorPoint(Map<String,Object> updateMap) {
    public Map<String, Object> updateMonitorPoint(Map<String,Object> parameterMap) {
        Map resultMap = new HashMap();
        Map<String,Object> updateMap = new HashMap<>();
        for (String key : parameterMap.keySet()) {
            updateMap.put(ConvertUtils.toLine(key),parameterMap.get(key));
        }
        if(!updateMap.containsKey("id")){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -146,11 +161,12 @@
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_NOT_EXIST.getMsg());
            return resultMap;
        }
        if (updateMap.get("name")==null||updateMap.get("name")==""){
        if (updateMap.get("name")!=null&&updateMap.get("name").equals("")){
            resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
            resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
            return resultMap;
        }
        if (updateMap.get("name")!=null){
        QueryWrapper<MonitorPoint> wapper_name = new QueryWrapper<>();
        wapper_name.eq("name",updateMap.get("name"));
        wapper_name.eq("is_delete",Constants.NOT_DELETE);
@@ -160,35 +176,36 @@
            resultMap.put("msg",ResponseCodeEnum.MONITOR_POINT_IS_EXIST.getMsg());
            return resultMap;
        }
        }
        monitorPointMapper.updateMonitorPoint(updateMap);
        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
        String content = "修改了站点:"+oldMonitorPoint.getName()+";";
        for (Object key:updateMap.keySet()) {
            if (key.toString().equals("name")){
            if (key.toString().equals("name")&&updateMap.get(key)!=null){
                content = content+"站点名称:"+oldMonitorPoint.getName()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("longitude")){
            if (key.toString().equals("longitude")&&updateMap.get(key)!=null){
                content = content+"经度:"+oldMonitorPoint.getLongitude()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("latitude")){
            if (key.toString().equals("latitude")&&updateMap.get(key)!=null){
                content = content+"纬度:"+oldMonitorPoint.getLatitude()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("province_code")){
            if (key.toString().equals("province_code")&&updateMap.get(key)!=null){
                content = content+"省份编码:"+oldMonitorPoint.getProvinceCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("city_code")){
            if (key.toString().equals("city_code")&&updateMap.get(key)!=null){
                content = content+"地级市编码:"+oldMonitorPoint.getCityCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("area_code")){
            if (key.toString().equals("area_code")&&updateMap.get(key)!=null){
                content = content+"县/区/县级市:"+oldMonitorPoint.getAreaCode()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("address")){
            if (key.toString().equals("address")&&updateMap.get(key)!=null){
                content = content+"地址:"+oldMonitorPoint.getAddress()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("organization_id")){
            if (key.toString().equals("organization_id")&&updateMap.get(key)!=null){
                content = content+"组织id:"+oldMonitorPoint.getOrganizationId()+"->"+updateMap.get(key)+";";
            }
            if (key.toString().equals("desc")){
            if (key.toString().equals("desc")&&updateMap.get(key)!=null){
                content = content+"描述:"+oldMonitorPoint.getDesc()+"->"+updateMap.get(key)+";";
            }
        }
@@ -264,6 +281,11 @@
            monitorPointMap.put("createTime",createTime);
            monitorPointMap.put("updateTime",updateTime);
            monitorPointMap.put("key",monitorPoint.getId());
            Organization organization = organizationMapper.selectById(Integer.parseInt(monitorPointMap.get("organizationId").toString()));
            if (!ObjectUtils.isEmpty(organization)) {
                String[] organizationArr = {monitorPointMap.get("organizationId").toString(),organization.getName()};
                monitorPointMap.put("organizationId",organizationArr);
            }
            monitorPointtList.add(monitorPointMap);
        }
        resultMap.put("monitorPoints",monitorPointtList);
@@ -276,4 +298,19 @@
        resultMap.put("totalPageNumber",totalPageNumber);
        return resultMap;
    }

    /**
     * @Description: 获取地区名
     * @Param: [areaArr, menu]menuMap：key为menuid，value为menu
     * @return: Array
     * @Author: lizijie
     * @Date: 2021/4/7
     */
    private String[] getAreaArr(String areaCode) {
        QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
        wrapper.eq("area_code",areaCode);
        SysArea sysArea = sysAreaMapper.selectOne(wrapper);
        String[] arr = {areaCode,sysArea.getAreaName()};
        return arr;
    }
}

 screen-manage/src/main/resources/mapper/ManageMenuMapper.xml

@@ -190,4 +190,30 @@
        limit #{start},#{number}
    </select>

    <select id="getManageMenuByNameFuzzy" parameterType="java.util.Map" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"></include>
        from manage_menu mm
        where mm.is_delete = 0
        <if test="name != null">
            and mm.name like concat('%',#{name},'%')
        </if>
        <if test="url != null">
            and mm.url = #{url}
        </if>
        <if test="icon != null">
            and mm.icon = #{icon}
        </if>
        <if test="parent_id != null">
            and mm.parent_id = #{parent_id}
        </if>
        <if test="order != null">
            and mm.order = #{order}
        </if>
        <if test="desc != null">
            and mm.desc = #{order}
        </if>
        limit #{start},#{number}
    </select>

</mapper>