登录页面背景图片维护；修改密码新增提示；完善项目维护

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

+package org.rcisoft.business.manage.controller;
+
+import org.rcisoft.business.manage.service.BusLoginImgService;
+import org.rcisoft.core.constant.MessageConstant;
+import org.rcisoft.core.model.PersistModel;
+import org.rcisoft.core.result.Result;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 登录页面背景图片维护
+ */
+@RestController
+@RequestMapping("manage/busloginimg")
+public class BusLoginImgController {
+
+    @Autowired
+    private BusLoginImgService busLoginImgService;
+
+    @RequestMapping("/upload")
+    public Result upload(@RequestParam MultipartFile file) {
+        PersistModel pm = busLoginImgService.save(file);
+        return Result.builder(pm, MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, null);
+    }
+
+    @DeleteMapping("/delete")
+    public Result delete(@RequestParam String id) {
+        PersistModel pm = busLoginImgService.delete(id);
+        return Result.builder(pm, MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR, id);
+    }
+
+    @GetMapping("/queryLoginImgList")
+    public List<Map<String,Object>> queryLoginImgList() {
+        return busLoginImgService.queryLoginImgList();
+    }
+}

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

+package org.rcisoft.business.manage.dao;
+
+import org.apache.ibatis.annotations.Select;
+import org.rcisoft.business.manage.entity.BusLoginImg;
+import org.rcisoft.core.base.BaseMapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface BusLoginImgRepository extends BaseMapper<BusLoginImg> {
+    /**
+     * 查询登录页背景图片列表
+     * @return
+     */
+    @Select("<script>select * from bus_login_img </script>")
+    List<Map<String,Object>> queryLoginImgList();
+}

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

+package org.rcisoft.business.manage.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+@Entity
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Table(name = "bus_login_img")
+public class BusLoginImg {
+
+    private String id;
+
+    private String imgUrl;
+}

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

@@ -77,5 +77,9 @@ public class BusProject{
      private String saveEstimate;
 
      private String saveFlag;
+
+     private String saveingCost;
+
+     private String saveingEnergy;
 }
 

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

+package org.rcisoft.business.manage.service;
+
+import org.rcisoft.business.manage.entity.BusLoginImg;
+import org.rcisoft.core.model.PersistModel;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+import java.util.Map;
+
+public interface BusLoginImgService {
+    //上传图片并保存
+    PersistModel save(MultipartFile file);
+    //删除
+    PersistModel delete(String id);
+    //列表
+    List<Map<String,Object>> queryLoginImgList();
+}

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

+package org.rcisoft.business.manage.service.impl;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.rcisoft.business.manage.dao.BusLoginImgRepository;
+import org.rcisoft.business.manage.entity.BusDeviceTp;
+import org.rcisoft.business.manage.entity.BusLoginImg;
+import org.rcisoft.business.manage.service.BusLoginImgService;
+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.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+import tk.mybatis.mapper.entity.Example;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+@Service
+@Transactional(readOnly = true,propagation = Propagation.NOT_SUPPORTED)
+@Slf4j
+public class BusLoginImgServiceImpl implements BusLoginImgService {
+    @Autowired
+    private BusLoginImgRepository busLoginImgRepository;
+    @Value("${filepath.loginimg}")
+    private String filepath;
+    @Value("${serverimgurl}")
+    private String serverimgurl;
+
+    @Override
+    public PersistModel save(MultipartFile file) {
+        int line = 1;
+        String fileName = file.getOriginalFilename();
+        //文件路径
+        String savePath = filepath + fileName;
+        File saveFile = new File(savePath);
+        if(saveFile.exists()){
+            saveFile.delete();
+        }
+        try{
+            FileUtils.copyInputStreamToFile(file.getInputStream(), saveFile);
+            BusLoginImg busLoginImg = new BusLoginImg();
+            busLoginImg.setId(UUID.randomUUID().toString().replace("-",""));
+            busLoginImg.setImgUrl(fileName);
+            line = busLoginImgRepository.insertSelective(busLoginImg);
+        }catch(Exception e){
+            line = 0;
+            e.printStackTrace();
+        }
+        return new PersistModel(line);
+    }
+
+    @Override
+    public PersistModel delete(String id) {
+        Example example = new Example(BusLoginImg.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andEqualTo("id",id);
+        int line = busLoginImgRepository.deleteByExample(example);
+        return new PersistModel(line);
+    }
+
+    @Override
+    public List<Map<String, Object>> queryLoginImgList() {
+        List<Map<String, Object>> list = busLoginImgRepository.queryLoginImgList();
+        for(Map<String, Object> map : list){
+            map.put("URL",serverimgurl + map.get("IMG_URL").toString());
+        }
+        return list;
+    }
+}

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

@@ -111,21 +111,6 @@ public class BusProjectServiceImpl implements BusProjectService {
             }
             energyPriceList.setEnergyPriceList(plist);
             PersistModel priceP =  energyPriceService.save(energyPriceList);
-            //项目认定
-            if(busProject.getSaveFlag()!=null && busProject.getSaveFlag().equals("1")){
-                List<BusSaving> busSavingList = new ArrayList<>();
-                BusSaving bs1 = new BusSaving();
-                bs1.setId(UUID.randomUUID().toString().replace("-",""));
-                bs1.setProId(busProject.getJwnum());
-                bs1.setType("1");
-                BusSaving bs2 = new BusSaving();
-                bs2.setId(UUID.randomUUID().toString().replace("-",""));
-                bs2.setProId(busProject.getJwnum());
-                bs2.setType("2");
-                busSavingList.add(bs1);
-                busSavingList.add(bs2);
-                PersistModel saveP = busSavingService.save(busSavingList);
-            }
             if(!areaP.isSuccessBySinglePersist()){
                 return areaP;
             }
@@ -184,17 +169,12 @@ public class BusProjectServiceImpl implements BusProjectService {
             PersistModel areaP = busProjectAreaService.delete(busProject.getProId());
             //删除能耗价格信息
             PersistModel priceP = energyPriceService.delete(busProject.getProId());
-            //删除项目认定信息
-            PersistModel saveP = busSavingService.delete(busProject.getProId());
             if(!areaP.isSuccessBySinglePersist()){
                 return areaP;
             }
             if(!priceP.isSuccessBySinglePersist()){
                 return priceP;
             }
-            if(!saveP.isSuccessBySinglePersist()){
-                return saveP;
-            }
         }
         return new PersistModel(line,message);
     }

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

@@ -57,15 +57,13 @@ public class LoginController extends PaginationController<SysUser> {
     @ResponseBody
     public Result updatePassWord(@RequestParam String newPassWord, @RequestParam String oldPassWord){
         String userId = UserUtil.getUserInfoProp(getToken(),UserUtil.USER_ID);
-        int flag = userService.updatePassWord(newPassWord, oldPassWord, userId);
-        return Result.builder(new PersistModel(flag));
+        return Result.builder(userService.updatePassWord(newPassWord, oldPassWord, userId));
 
 
     }
 
 
     @ApiOperation(value = "重置密码")
-    @ApiImplicitParams({@ApiImplicitParam(name = "needUserId", value = "需要修改密码的用户的ID", required = true, dataType = "varchar",paramType = "body")})
     @ResponseBody
     @PutMapping(value = "/resetPassWord")
     public Result resetPassWord(@RequestParam String needUserId){

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

@@ -2,6 +2,7 @@ package org.rcisoft.business.system.user.service;
 
 import org.rcisoft.business.system.user.entity.*;
 import org.rcisoft.core.aop.PageUtil;
+import org.rcisoft.core.model.PersistModel;
 
 import java.util.List;
 import java.util.Map;
@@ -76,7 +77,7 @@ public interface UserService {
       * @param oldPassWord
       * @return
       */
-     int updatePassWord(String newPassWord, String oldPassWord,String userId);
+     PersistModel updatePassWord(String newPassWord, String oldPassWord, String userId);
 
      /** 重置密码
       * @param userId

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

@@ -12,6 +12,7 @@ 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.model.PersistModel;
 import org.rcisoft.core.util.IdGen;
 import org.rcisoft.core.util.JwtUtil;
 import org.rcisoft.core.util.UserUtil;
@@ -261,8 +262,9 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public int updatePassWord(String newPassWord, String oldPassWord,String userId) {
+    public PersistModel updatePassWord(String newPassWord, String oldPassWord, String userId) {
         int flag = 0;
+        String message = "";
         SysUser sysUser = userRepository.selectByPrimaryKey(userId);
         String encodedPassword = sysUser.getUserPwd();
         boolean matches = passwordEncoder.matches(oldPassWord, encodedPassword);
@@ -270,8 +272,10 @@ public class UserServiceImpl implements UserService {
             sysUser.setUserPwd(passwordEncoder.encode(newPassWord));
             int i = userRepository.updateByPrimaryKeySelective(sysUser);
             flag = i;
+        }else{
+            message = "原密码错误，修改失败";
         }
-        return flag;
+        return new PersistModel(flag,message);
     }
 
     @Override

src/main/resources/application-dev.yml

@@ -106,5 +106,6 @@ filepath:
   analysis: D:\zhny\filepath\analysis\
   equipment: D:\zhny\filepath\equipment\
   devicetp: D:\zhny\filepath\devicetp\
+  loginimg: D:\zhny\filepath\loginimg\
 
 serverimgurl: 127.0.0.1:9000/
\ No newline at end of file

src/main/resources/application-prod.yml

@@ -99,5 +99,6 @@ filepath:
   analysis: /home/zhny/filepath/analysis/
   equipment: /home/zhny/filepath/equipment/
   devicetp: /home/zhny/filepath/devicetp/
+  loginimg: /home/zhny/filepath/loginimg/
 
 serverimgurl: 139.199.98.105:9000/
\ No newline at end of file