项目配置后台功能完善

src/main/java/org/rcisoft/business/device/assets/controller/BusDeviceController.java

@@ -16,8 +16,11 @@ import org.rcisoft.core.model.GridModel;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.WebRequest;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
@@ -25,8 +28,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -163,6 +168,11 @@ public class BusDeviceController extends PaginationController<BusDevice> {
             e.printStackTrace();
         }
     }
+    @InitBinder
+    public void initBinder(WebDataBinder webDataBinder, WebRequest webRequest) {
+        DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        webDataBinder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
+    }
 
 
 

src/main/java/org/rcisoft/business/device/assets/dao/BusDeviceRepository.java

@@ -22,7 +22,7 @@ public interface BusDeviceRepository extends BaseMapper<BusDevice> {
     * 分页查询 busDevice
     *
     */
-    @Select("<script>select a.*,b.FAC_NM from bus_device a left join bus_factory b on a.fac_id = b.fac_id where 1=1 and a.pro_id = #{proId} " +
+    @Select("<script>select a.*,b.FAC_NM,DATE_FORMAT(a.install_date,'%Y-%m-%d') INSTALL_DAY from bus_device a left join bus_factory b on a.fac_id = b.fac_id where 1=1 and a.pro_id = #{proId} " +
             "<if test='devTpId != null'> and a.dev_tp_id = #{devTpId}</if>"
             + "</script>")
     List<Map<String,Object>> queryBusDevices(BusDevice busDevice);

src/main/java/org/rcisoft/business/device/assets/service/impl/BusDeviceServiceImpl.java

@@ -3,8 +3,11 @@ package org.rcisoft.business.device.assets.service.impl;
 import org.rcisoft.business.device.assets.dao.BusDeviceRepository;
 import org.rcisoft.business.device.assets.service.BusDeviceService;
 import org.rcisoft.business.device.assets.vo.DeviceAssetStatisticVo;
+import org.rcisoft.business.manage.dao.BusLibraryParamRepository;
 import org.rcisoft.business.manage.entity.BusDevicetpParam;
+import org.rcisoft.business.manage.entity.BusLibraryParam;
 import org.rcisoft.business.manage.service.BusDeviceParamService;
+import org.rcisoft.business.manage.service.BusLibraryParamService;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.business.device.assets.entity.BusDevice;
@@ -16,6 +19,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,6 +40,8 @@ public class BusDeviceServiceImpl implements BusDeviceService {
     private BusDeviceRepository busDeviceRepository;
     @Autowired
     private BusDeviceParamService busDeviceParamService;
+    @Autowired
+    private BusLibraryParamRepository busLibraryParamRepository;
 
 
     /**
@@ -46,6 +52,10 @@ public class BusDeviceServiceImpl implements BusDeviceService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel save(BusDevice busDevice){
+        /*SimpleDateFormat simple = new SimpleDateFormat("yyyy-MM-dd");
+        if(busDevice.getInstallDate()!=null){
+            busDevice.setInstallDate(simple.parse(busDevice.getInstallDate()));
+        }*/
         //增加操作
         busDevice.setDevId(UUID.randomUUID().toString().replace("-",""));
         int line = busDeviceRepository.insertSelective(busDevice);
@@ -65,7 +75,7 @@ public class BusDeviceServiceImpl implements BusDeviceService {
         Example example = new Example(BusDevice.class);
         Example.Criteria criteria = example.createCriteria();
         criteria.andEqualTo("devId",busDevice.getDevId());
-        line = busDeviceRepository.updateByExample(busDevice,example);
+        line = busDeviceRepository.updateByExampleSelective(busDevice,example);
         return new PersistModel(line);
     }
 
@@ -115,6 +125,7 @@ public class BusDeviceServiceImpl implements BusDeviceService {
             List<Map<String,Object>> list = busDeviceRepository.queryBusDevices(busDevice);
             for(Map<String,Object> tmap : list){
                 tmap.put("paramList",busDeviceParamService.findByDev(tmap.get("DEV_NUM").toString(),tmap.get("PRO_ID").toString()));
+                tmap.put("libraryparam",busLibraryParamRepository.queryLibraryParamByDev(tmap.get("DEV_NUM").toString()));
             }
             return list;
         }

src/main/java/org/rcisoft/business/evaluate/team/dao/BusTeamRepository.java

@@ -8,6 +8,7 @@ import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by liuzhichao on 2018/4/19.
@@ -24,6 +25,13 @@ public interface BusTeamRepository extends BaseMapper<BusTeam>{
     @ResultMap(value = "BaseResultMap" )
     List<BusTeam> selectByTeamId(@Param("type") String type);
 
+    /**
+     * 所有业主列表
+     * @return
+     */
+    @Select("<script>select * from bus_team</script>")
+    List<Map<String,Object>> listTeamAll();
+
 
 
 }

src/main/java/org/rcisoft/business/mainte/energyplan/service/impl/BusEnergyPlanServiceImpl.java

@@ -7,6 +7,7 @@ import org.rcisoft.business.mainte.energyplan.entity.BusEnergyPlan;
 import org.rcisoft.business.mainte.energyplan.service.BusEnergyPlanService;
 import org.rcisoft.business.mainte.energyplan.vo.EnergyPlanVo;
 import org.rcisoft.business.mainte.paramlibrary.dao.ParamLibraryRepository;
+import org.rcisoft.core.util.UploadUtil;
 import org.rcisoft.core.util.UserUtil;
 import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.model.PersistModel;
@@ -14,6 +15,7 @@ import org.rcisoft.core.model.PersistModel;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
@@ -39,6 +41,8 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
     private BusEnergyPlanRepository busEnergyPlanRepository;
     @Autowired
     private ParamLibraryRepository paramLibraryRepository;
+    @Value("${serverimgurl}")
+    private String serverImgUrl;
 
 
     /**
@@ -178,7 +182,17 @@ public class BusEnergyPlanServiceImpl implements BusEnergyPlanService {
 
     @Override
     public List<Map<String, Object>> queryDeviceTp() {
-        return busEnergyPlanRepository.queryDeviceTp();
+        List<Map<String, Object>> list = busEnergyPlanRepository.queryDeviceTp();
+        for(Map<String, Object> m : list){
+            if(m.get("DEV_TP_IMG")!=null && !m.get("DEV_TP_IMG").toString().equals("") && !m.get("DEV_TP_IMG").toString().equals("null")){
+                String type = "";
+                String img = UploadUtil.GetImageStr(m.get("DEV_TP_IMG").toString());
+                m.put("IMG", img);
+            }else{
+                m.put("IMG","");
+            }
+        }
+        return list;
     }
 
     @Override

src/main/java/org/rcisoft/business/manage/controller/BusDeviceParamController.java

@@ -51,10 +51,10 @@ public class BusDeviceParamController extends PaginationController<BusDevicePara
 
     @ApiOperation(value="添加或修改设备参数模板", notes="添加或修改设备参数模板")
     @PutMapping("/saveOrupdate")
-    public Result saveOrupdate(@RequestBody BusDeviceParamList busDeviceParamList,@RequestParam String proId) {
+    public Result saveOrupdate(@RequestBody BusDeviceParamList busDeviceParamList) {
         PersistModel data = null;
         String devNum = busDeviceParamList.getBusDeviceParamList().get(0).getDevNum();
-        List<Map<String,Object>> list = busDeviceParamServiceImpl.findByDev(devNum,proId);
+        List<Map<String,Object>> list = busDeviceParamServiceImpl.findByDev(devNum,busDeviceParamList.getProId());
         if(list.size()>0){
             data = busDeviceParamServiceImpl.merge(busDeviceParamList);
         }else{

src/main/java/org/rcisoft/business/manage/controller/BusProjectController.java

@@ -44,10 +44,7 @@ public class BusProjectController extends PaginationController<BusProject> {
     @PostMapping(value = "/add")
     public Result add(@Valid BusProject busProject) {
         PersistModel data = busProjectServiceImpl.save(busProject);
-        return Result.builder(data,
-            MessageConstant.MESSAGE_ALERT_SUCCESS,
-            MessageConstant.MESSAGE_ALERT_ERROR,
-        busProject);
+        return Result.builder(data);
     }
 
 
@@ -73,13 +70,13 @@ public class BusProjectController extends PaginationController<BusProject> {
                 busProject);
     }
 
-    @ApiOperation(value="根据ID查询单个项目信息", notes="根据ID查询单个项目信息")
+    @ApiOperation(value="根据条件查询单个项目信息", notes="根据条件查询单个项目信息")
     @GetMapping("/detail")
-    public Result detail(@RequestParam String id) {
+    public Result detail(@Valid BusProject busProject) {
         return Result.builder(new PersistModel(1),
             MessageConstant.MESSAGE_ALERT_SUCCESS,
             MessageConstant.MESSAGE_ALERT_ERROR,
-        busProjectServiceImpl.findById(id));
+        busProjectServiceImpl.findByParam(busProject));
     }
 
     @ApiOperation(value="查看  集合", notes="查看  集合")

src/main/java/org/rcisoft/business/manage/dao/BusLibraryParamRepository.java

@@ -27,5 +27,8 @@ public interface BusLibraryParamRepository extends BaseMapper<BusLibraryParam> {
             "where l.DEV_NUM=d.DEV_NUM and l.PARAM=d.PARAM and d.PARAM_CODE=t.PARAM_CODE " +
             "and l.DEV_NUM=#{devNum} and t.PRO_ID=substring_index(#{devNum}, '_', 1)</script>")
     List<Map<String, String>> selectParamsByDevNum(@Param(value = "devNum") String devNum);
+
+    @Select("<script>select * from bus_library_param where dev_num = #{devNum}</script>")
+    List<Map<String,Object>> queryLibraryParamByDev(@Param("devNum") String devNum);
 }
 

src/main/java/org/rcisoft/business/manage/dao/ProjectRepository.java

@@ -15,16 +15,6 @@ import java.util.Map;
 @Repository
 public interface ProjectRepository extends BaseMapper<BusProject> {
 
-    /**
-    * 分页查询 busProject
-    *
-    */
-    @Select("<script>select * from bus_project where 1=1" +
-            "<if test =' proId != null '> and pro_id = #{proId}</if>"
-            + "</script>")
-    @ResultMap(value = "BaseResultMap" )
-    List<BusProject> queryBusProjects(BusProject busProject);
-
     /**
      * 查看项目下是否有设备
      * @param map
@@ -43,5 +33,23 @@ public interface ProjectRepository extends BaseMapper<BusProject> {
             "where b.USER_ID = #{user_id}" +
             "</script>")
     List<Map<String,Object>> queryBusProjectByUser(Map<String,Object> map);
+
+    /**
+     * 查询项目信息
+     * @return
+     */
+    @Select("<script>SELECT\n" +
+            "\ta.*,e.SYS_NM,b.BLD_TP_NM,c.OWN_NM,d1.TEAM_NM TEAM_NM_ON,d2.TEAM_NM TEAM_NM_OFF\n" +
+            "FROM bus_project a \n" +
+            "LEFT JOIN bus_build_tp b ON a.BLD_TP_ID = b.BLD_TP_ID\n" +
+            "LEFT JOIN sys_owner c ON a.OWN_ID = c.OWN_ID\n" +
+            "LEFT JOIN bus_team d1 on a.TEAM_ID_ON = d1.TEAM_ID\n" +
+            "LEFT JOIN bus_team d2 on a.TEAM_ID_OFF = d2.TEAM_ID\n" +
+            "LEFT JOIN bus_system e on a.PRO_ID = e.PRO_ID\n" +
+            "where 1=1 " +
+            "<if test =' proId != null '> and a.pro_id = #{proId}</if>" +
+            "<if test =' jwnum != null '> and a.jwnum = #{jwnum}</if>" +
+            "</script>")
+    List<Map<String,Object>> queryBusProjects(BusProject busProject);
 }
 

src/main/java/org/rcisoft/business/manage/entity/BusProject.java

@@ -36,7 +36,9 @@ public class BusProject{
 
      private String ownId;
 
-     private String teamId;
+     private String teamIdOn;
+
+     private String teamIdOff;
 
      private String jwnum;
 

src/main/java/org/rcisoft/business/manage/service/BusProjectService.java

@@ -35,18 +35,17 @@ public interface BusProjectService {
     PersistModel delete(BusProject busProject);
 
     /**
-    * 根据id查询 
-    * @param id
+    * 根据条件查询
     * @return
     */
-    List<Map<String,Object>> findById(String id);
+    List<Map<String,Object>> findByParam(BusProject bus);
 
     /**
     * 分页查询 
     * @param busProject
     * @return
     */
-    List<BusProject> findAllByPagination(PageUtil<BusProject> paginationUtility,
+    List<Map<String,Object>> findAllByPagination(PageUtil<BusProject> paginationUtility,
                                          BusProject busProject);
 
 

src/main/java/org/rcisoft/business/manage/service/impl/BusDeviceTpServiceImpl.java

@@ -105,7 +105,7 @@ public class BusDeviceTpServiceImpl implements BusDeviceTpService {
         String savePath = filepath + devTpId + suffixName;
         File saveFile = new File(savePath);
         if(saveFile.exists()){
-            line = 0;
+            saveFile.delete();
         }
         try{
             FileUtils.copyInputStreamToFile(file.getInputStream(), saveFile);

src/main/java/org/rcisoft/business/manage/service/impl/BusProjectServiceImpl.java

@@ -40,8 +40,17 @@ public class BusProjectServiceImpl implements BusProjectService {
     @Transactional(propagation = Propagation.REQUIRED,isolation = Isolation.DEFAULT)
     @Override
     public PersistModel save(BusProject busProject){
+        Integer line = 1;
+        String message = "";
         busProject.setProId(busProject.getJwnum());
-        int line = projectRepository.insertSelective(busProject);
+        BusProject bus = new BusProject();
+        bus.setProId(busProject.getProId());
+        if(findByParam(bus)!=null && findByParam(bus).size()>0){
+            line = 0;
+            message = "网关编号重复，项目新增失败";
+            return new PersistModel(line,message);
+        }
+        line = projectRepository.insertSelective(busProject);
         return new PersistModel(line);
     }
 
@@ -79,14 +88,11 @@ public class BusProjectServiceImpl implements BusProjectService {
     }
 
     /**
-    * 根据id查询 busProject
-    * @param id
+    * 根据参数查询 busProject
     * @return
     */
-    public List<Map<String,Object>> findById(String id){
-        org.rcisoft.business.overview.entity.BusProject bus = new org.rcisoft.business.overview.entity.BusProject();
-        bus.setProId(id);
-        return busProjectRepository.queryBusProjects(bus);
+    public List<Map<String,Object>> findByParam(BusProject bus){
+        return projectRepository.queryBusProjects(bus);
     }
 
     /**
@@ -94,9 +100,9 @@ public class BusProjectServiceImpl implements BusProjectService {
     * @param busProject
     * @return
     */
-    public List<BusProject> findAllByPagination(PageUtil<BusProject> paginationUtility,
+    public List<Map<String,Object>> findAllByPagination(PageUtil<BusProject> paginationUtility,
         BusProject busProject){
-        return projectRepository.queryBusProjects(busProject);
+        return projectRepository.queryBusProjects(null);
     }
 
     @Override

src/main/java/org/rcisoft/business/manage/vo/BusDeviceParamList.java

@@ -7,6 +7,8 @@ import java.util.List;
 public class BusDeviceParamList {
     private List<BusDeviceParam> busDeviceParamList;
 
+    private String proId;
+
     public List<BusDeviceParam> getBusDeviceParamList() {
         return busDeviceParamList;
     }
@@ -14,4 +16,12 @@ public class BusDeviceParamList {
     public void setBusDeviceParamList(List<BusDeviceParam> busDeviceParamList) {
         this.busDeviceParamList = busDeviceParamList;
     }
+
+    public String getProId() {
+        return proId;
+    }
+
+    public void setProId(String proId) {
+        this.proId = proId;
+    }
 }

src/main/java/org/rcisoft/business/overview/dao/BusProjectRepository.java

 package org.rcisoft.business.overview.dao;
 
 import org.apache.ibatis.annotations.ResultType;
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.overview.entity.BusProject;
 import org.rcisoft.core.base.BaseMapper;
-import org.apache.ibatis.annotations.ResultMap;
-import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Repository;
 
-
 import java.util.List;
 import java.util.Map;
 
@@ -17,22 +15,6 @@ import java.util.Map;
 @Repository
 public interface BusProjectRepository extends BaseMapper<BusProject> {
 
-    /**
-     * 查询项目信息
-     * @return
-     */
-    @Select("<script>SELECT\n" +
-            "\ta.*,e.SYS_NM,b.BLD_TP_NM,c.OWN_NM,d1.TEAM_NM TEAM_NM_ON,d2.TEAM_NM TEAM_NM_OFF\n" +
-            "FROM bus_project a \n" +
-            "LEFT JOIN bus_build_tp b ON a.BLD_TP_ID = b.BLD_TP_ID\n" +
-            "LEFT JOIN sys_owner c ON a.OWN_ID = c.OWN_ID\n" +
-            "LEFT JOIN bus_team d1 on a.TEAM_ID_ON = d1.TEAM_ID\n" +
-            "LEFT JOIN bus_team d2 on a.TEAM_ID_OFF = d2.TEAM_ID\n" +
-            "LEFT JOIN bus_system e on a.PRO_ID = e.PRO_ID\n" +
-            "where 1=1 " +
-            "<if test =' proId != null '> and a.pro_id = #{proId}</if>" +
-            "</script>")
-    List<Map<String,Object>> queryBusProjects(BusProject busProject);
 
     @Select("<script>select distinct code from bus_project</script>")
     @ResultType(String.class)

src/main/java/org/rcisoft/business/system/user/controller/UserController.java

@@ -3,6 +3,7 @@ package org.rcisoft.business.system.user.controller;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.rcisoft.business.manage.entity.BusProject;
 import org.rcisoft.business.system.user.entity.SysAdmins;
 import org.rcisoft.business.system.user.entity.SysOwner;
 import org.rcisoft.business.system.user.entity.SysPrincipal;
@@ -10,8 +11,11 @@ import org.rcisoft.business.system.user.entity.SysUser;
 import org.rcisoft.business.system.user.service.UserService;
 import org.rcisoft.business.system.user.vo.UserDto;
 import org.rcisoft.core.constant.MessageConstant;
+import org.rcisoft.core.controller.PaginationController;
+import org.rcisoft.core.model.GridModel;
 import org.rcisoft.core.model.PersistModel;
 import org.rcisoft.core.result.Result;
+import org.rcisoft.core.util.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -22,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  */
 @Controller
 @RequestMapping("user")
-public class UserController {
+public class UserController  extends PaginationController<SysUser> {
 
     @Autowired
     private UserService userService;
@@ -85,12 +89,53 @@ public class UserController {
             @ApiImplicitParam(name = "userId", value = "userId", required = true,paramType = "path", dataType = "varchar"),
     })
     @ResponseBody
-    @GetMapping(value = "/listMenu/{userId}")
-    public Result listMenu(@PathVariable("userId") String userId){
+    @GetMapping(value = "/listMenu")
+    public Result listMenu(){
+        String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
         Object data = userService.listMenuBuUserId(userId);
         return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
     }
 
+    @ApiOperation(value = "查詢所有菜單")
+    @ResponseBody
+    @GetMapping(value = "/listMenuAll")
+    public Result listMenuAll(){
+        Object data = userService.listMenuAll();
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+    @ApiOperation(value = "查詢所有角色")
+    @ResponseBody
+    @GetMapping(value = "/listRoleAll")
+    public Result listRoleAll(){
+        Object data = userService.listRoleAll();
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+    @ApiOperation(value = "查詢所有业主")
+    @ResponseBody
+    @GetMapping(value = "/listOnwerAll")
+    public Result listOnwerAll(){
+        Object data = userService.listOwnerAll();
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+    @ApiOperation(value = "查詢所有团队")
+    @ResponseBody
+    @GetMapping(value = "/listTeamAll")
+    public Result listTeamAll(){
+        Object data = userService.listTeamAll();
+        return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
+    }
+
+    @ApiOperation(value = "查詢所有用户")
+    @ResponseBody
+    @GetMapping(value = "/listUserAllByPagination")
+    public GridModel listUserAllByPagination(@RequestParam String userTp){
+        userService.listUserAllByPagination(getPaginationUtility(),userTp);
+        return getGridModelResponse();
+    }
+
 
 
 

src/main/java/org/rcisoft/business/system/user/dao/AdminRepository.java

@@ -13,7 +13,7 @@ import java.util.Map;
  * @Date: Created in 10:422018/5/2
  */
 @Repository
-public interface AdminRepository extends BaseMapper<SysAdmins>{
+public interface AdminRepository    extends BaseMapper<SysAdmins>{
 
     /** 根据userId查询当前管理员信息
      * @param userId

src/main/java/org/rcisoft/business/system/user/dao/OwnerRepository.java

 package org.rcisoft.business.system.user.dao;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.system.user.entity.SysAdmins;
 import org.rcisoft.business.system.user.entity.SysOwner;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Author: GaoLiWei
  * @Date: Created in 10:422018/5/2
@@ -26,4 +30,11 @@ public interface OwnerRepository extends BaseMapper<SysOwner>{
      */
     Integer deleteSysOwnerByUserId(@Param("userId") String userId);
 
+    /**
+     * 所有业主列表
+     * @return
+     */
+    @Select("<script>select * from sys_owner</script>")
+    List<Map<String,Object>> listOwnerAll();
+
 }

src/main/java/org/rcisoft/business/system/user/dao/RelUserRoleRepository.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.system.user.dao;
 
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.system.user.entity.RelUserRole;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
@@ -22,6 +23,13 @@ public interface RelUserRoleRepository extends BaseMapper<RelUserRole> {
      */
     List<Map<String,Object>> listMenuBuUserId(@Param("userId") String userId);
 
+    /**
+     * 查詢所有菜單
+     * @return
+     */
+    @Select("<script>select * from sys_menu</script>")
+    List<Map<String,Object>> listMenuAll();
+
 
 
 

src/main/java/org/rcisoft/business/system/user/dao/RoleRepository.java

 package org.rcisoft.business.system.user.dao;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.system.user.entity.SysRole;
 import org.rcisoft.business.system.user.entity.SysUser;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: GaoLiWei
@@ -20,4 +22,12 @@ public interface RoleRepository extends BaseMapper<SysUser>{
      * @return
      */
     List<SysRole> listRoleByUserId(@Param("userId") String userId);
+
+    @Select("<script>select a.*,b.MENU_ID from sys_role a left join rel_role_menu b on a.role_id = b.role_id</script>")
+    List<Map<String,Object>> listRoleAll();
+
+    @Select("<script>select * from sys_menu where MENU_ID in <foreach collection=\"menuList\" index=\"index\" item=\"menu\" open=\"(\" separator=\",\" close=\")\">\n" +
+            "            #{menu}\n" +
+            "        </foreach></script>")
+    List<Map<String,Object>> queryMenuByIds(@Param("menuList") List<String> menuList);
 }

src/main/java/org/rcisoft/business/system/user/dao/UserRepository.java

 package org.rcisoft.business.system.user.dao;
 
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.rcisoft.business.system.user.entity.SysUser;
 import org.rcisoft.core.base.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author: GaoLiWei
@@ -19,4 +21,17 @@ public interface UserRepository extends BaseMapper<SysUser>{
      * @return
      */
     List<SysUser> listByUserName(@Param("userName") String userName);
+
+
+    /**
+     * 查询所有用户
+     * @return
+     */
+    @Select("<script>select a.*,b.* from sys_user a left join ${stable} b on a.USER_ID = b.USER_ID where" +
+            " 1=1" +
+            "<if test = \"userTp=='1'.toString()\"> and (user_tp = '1' or user_tp = '2')</if>" +
+            "<if test = \"userTp=='2'.toString()\"> and user_tp = '3'</if>" +
+            "<if test = \"userTp=='3'.toString()\"> and user_tp = '4'</if></script>")
+    List<Map<String,Object>> listUserAll(@Param("stable") String stable,@Param("userTp") String userTp);
+
 }

src/main/java/org/rcisoft/business/system/user/service/UserService.java

 package org.rcisoft.business.system.user.service;
 
+import org.apache.ibatis.annotations.Param;
+import org.rcisoft.business.device.assets.entity.BusDevice;
 import org.rcisoft.business.system.user.entity.SysAdmins;
 import org.rcisoft.business.system.user.entity.SysOwner;
 import org.rcisoft.business.system.user.entity.SysPrincipal;
 import org.rcisoft.business.system.user.entity.SysUser;
+import org.rcisoft.core.aop.PageUtil;
 
 import java.util.List;
 import java.util.Map;
@@ -60,7 +63,15 @@ public interface UserService {
       */
      List<Map<String,Object>> listMenuBuUserId(String userId);
 
+     List<Map<String,Object>> listMenuAll();
 
+     List<Map<String,Object>> listRoleAll();
+
+     List<Map<String,Object>> listTeamAll();
+
+     List<Map<String,Object>> listOwnerAll();
+
+     List<Map<String,Object>> listUserAllByPagination(PageUtil<SysUser> paginationUtility,String userTp);
 
 
 }

src/main/java/org/rcisoft/business/system/user/service/impl/UserServiceImpl.java

 package org.rcisoft.business.system.user.service.impl;
 
+import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
+import org.rcisoft.business.device.assets.entity.BusDevice;
+import org.rcisoft.business.evaluate.team.dao.BusTeamRepository;
 import org.rcisoft.business.system.user.dao.*;
 import org.rcisoft.business.system.user.entity.*;
 import org.rcisoft.business.system.user.service.UserService;
 import org.rcisoft.common.constants.SysRoleConstant;
 import org.rcisoft.common.constants.UserPassWordConstant;
 import org.rcisoft.common.constants.UserTpConstant;
+import org.rcisoft.core.aop.PageUtil;
 import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.JwtUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +25,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,6 +56,10 @@ public class UserServiceImpl implements UserService {
     private UserDetailsService userDetailsService;
     @Autowired
     private PasswordEncoder passwordEncoder;
+    @Autowired
+    private RoleRepository roleRepository;
+    @Autowired
+    private BusTeamRepository busTeamRepository;
 
 
     @Override
@@ -227,6 +237,72 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public List<Map<String, Object>> listMenuBuUserId(String userId) {
-        return  relUserRoleRepository.listMenuBuUserId(userId);
+        List<Map<String, Object>> list =  relUserRoleRepository.listMenuBuUserId(userId);
+        return handleMenu(list);
+    }
+
+    @Override
+    public List<Map<String, Object>> listMenuAll() {
+        List<Map<String, Object>> list = relUserRoleRepository.listMenuAll();
+        return handleMenu(list);
+    }
+
+    @Override
+    public List<Map<String, Object>> listRoleAll() {
+        //
+        List<Map<String, Object>> list = roleRepository.listRoleAll();
+        for(Map<String, Object> mp : list){
+            String menuIds = mp.get("MENU_ID").toString();
+            String[] menuArr = menuIds.split(",");
+            List<String> menuList = new ArrayList<>();
+            for(String s : menuArr){menuList.add(s);}
+            mp.put("MENULIST",handleMenu(roleRepository.queryMenuByIds(menuList)));
+        }
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> listTeamAll() {
+        return busTeamRepository.listTeamAll();
+    }
+
+    @Override
+    public List<Map<String, Object>> listOwnerAll() {
+        return ownerRepository.listOwnerAll();
+    }
+
+    @Override
+    public List<Map<String, Object>> listUserAllByPagination(PageUtil<SysUser> paginationUtility,String userTp) {
+        String table  = "";
+        if(userTp!=null && userTp.equals("1")){table = "sys_admins";}
+        if(userTp!=null && userTp.equals("2")){table = "sys_owner";}
+        if(userTp!=null && userTp.equals("3")){table = "sys_principal";}
+        return userRepository.listUserAll(table,userTp);
+    }
+
+    public List<Map<String, Object>> handleMenu(List<Map<String, Object>> menuList){
+        List<Map<String, Object>> result = new ArrayList<>();
+        for(Map<String, Object> tmap : menuList){
+            if(tmap.get("MENU_PID")==null){
+                Map<String,Object> map = new HashMap<>();
+                map.put("id",tmap.get("MENU_ID"));
+                map.put("label",tmap.get("MENU_NM"));
+                result.add(map);
+            }
+        }
+        for(Map<String, Object> rmap : result){
+            String pid = rmap.get("id").toString();
+            List<Map<String, Object>> childList = new ArrayList<>();
+            for(Map<String, Object> tmap : menuList){
+                if(tmap.get("MENU_PID")!=null && tmap.get("MENU_PID").toString().equals(pid)){
+                    Map<String, Object> m = new HashMap<>();
+                    m.put("id",tmap.get("MENU_ID"));
+                    m.put("label",tmap.get("MENU_NM"));
+                    childList.add(m);
+                }
+            }
+            rmap.put("children",childList);
+        }
+        return result;
     }
 }

src/main/java/org/rcisoft/core/model/CustomDate.java

+package org.rcisoft.core.model;
+
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.WebDataBinder;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.support.WebBindingInitializer;
+import org.springframework.web.context.request.WebRequest;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**'
+ * 时间转换-全局
+ */
+public class CustomDate  implements WebBindingInitializer {
+    @Override
+    public void initBinder(WebDataBinder webDataBinder, WebRequest webRequest) {
+        DateFormat dateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        webDataBinder.registerCustomEditor(Date.class, new CustomDateEditor(dateFormat, true));
+    }
+}

src/main/java/org/rcisoft/core/result/Result.java

@@ -35,8 +35,10 @@ public class Result {
         result.setMessage(dataModel.getInfluenceReason());
         if(dataModel.isSuccessBySinglePersist()){
            result.setCode(200);
+           result.setMessage("操作成功");
         } else{
             result.setCode(500);
+            result.setMessage(dataModel.getInfluenceReason());
         }
         return result;
     }

src/main/java/org/rcisoft/core/util/UploadUtil.java

@@ -3,9 +3,13 @@ package org.rcisoft.core.util;
 import org.rcisoft.common.component.Global;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.multipart.MultipartFile;
+import sun.misc.BASE64Encoder;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
@@ -71,4 +75,41 @@ public class UploadUtil {
             return map;
         }
     }
+
+    /**
+     * 将图片文件转化为字节数组字符串，并对其进行Base64编码处理
+     * @return
+     */
+    public static String GetImageStr(String imgFile) {
+        File file = new File(imgFile);
+        if(imgFile==null || imgFile.equals("")){
+            return "";
+        }
+        InputStream in = null;
+        byte[] data = null;
+        //读取图片字节数组
+        try
+        {
+            in = new FileInputStream(file);
+            data = new byte[in.available()];
+            in.read(data);
+            in.close();
+        }
+        catch (IOException e)
+        {
+            e.printStackTrace();
+        }
+        if(data==null){
+            return null;
+        }
+        //对字节数组Base64编码
+        BASE64Encoder encoder = new BASE64Encoder();
+        String base64 =  encoder.encode(data);//返回Base64编码过的字节数组字符串
+        String suffixName = imgFile.substring(imgFile.lastIndexOf(".")+1);
+        if(suffixName.equals("jpg")){
+            return "data:image/jpeg;base64,"+base64;
+        }else{
+            return "data:image/"+suffixName+";base64,"+base64;
+        }
+    }
 }

src/main/resources/application.yml

@@ -5,4 +5,6 @@ spring:
 filepath:
   analysis: D:\zhny\filepath\analysis\
   equipment: D:\zhny\filepath\equipment\
-  devicetp: D:\zhny\filepath\devicetp\
+  devicetp: D:\zhny\filepath\devicetp\
\ No newline at end of file
+
+serverimgurl: 192.168.1.164:9000/
\ No newline at end of file

src/main/resources/mapper/sys/manage.mapper/BusProjectMapper.xml

@@ -9,7 +9,8 @@
             <result column="BLD_LOCAL" jdbcType="VARCHAR" property="bldLocal"/>
             <result column="BLD_COORDINATE" jdbcType="VARCHAR" property="bldCoordinate"/>
             <result column="OWN_ID" jdbcType="VARCHAR" property="ownId"/>
-            <result column="TEAM_ID" jdbcType="VARCHAR" property="teamId"/>
+            <result column="TEAM_ID_ON" jdbcType="VARCHAR" property="teamIdOn"/>
+            <result column="TEAM_ID_OFF" jdbcType="VARCHAR" property="teamIdOff"/>
             <result column="JWNUM" jdbcType="VARCHAR" property="jwnum"/>
             <result column="PROVINCE" jdbcType="VARCHAR" property="province"/>
             <result column="CITY" jdbcType="VARCHAR" property="city"/>