mlx

simulation-oauth-client/src/main/java/com/css/simulation/oauth/client/controller/SignController.java

@@ -23,12 +23,8 @@ import org.apache.http.client.config.RequestConfig;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -36,7 +32,7 @@ import java.time.Duration;
 import java.util.List;
 import java.util.Set;
 
-@Controller
+@RestController
 @RequestMapping("/sign")
 @Slf4j
 public class SignController {
@@ -86,7 +82,6 @@ public class SignController {
      */
     @RequestMapping("/single")
     @SneakyThrows
-    @ResponseBody
     public ResponseBodyVO<SimulationTokenVO> single(@RequestBody SignSingleParameter signSingleParameter, HttpServletRequest request) {
 
         String code = signSingleParameter.getCode();
@@ -248,7 +243,6 @@ public class SignController {
      */
     @RequestMapping("/username")
     @SneakyThrows
-    @ResponseBody
     public ResponseBodyVO<SimulationTokenVO> username(@RequestBody @Validated SignUsernameParameter signSingleParameter, HttpServletRequest request) {
         log.info("登录参数为：" + signSingleParameter);
         String username = signSingleParameter.getUsername();
@@ -266,9 +260,11 @@ public class SignController {
 
         //登录逻辑判断
         if (userVO == null) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "用户名或密码错误!");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "用户名或密码错误。");
+        } else if (!username.equals(userVO.getUsername()) && username.equalsIgnoreCase(userVO.getUsername())) {
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "用户名大小写格式有问题。");
         } else if (!"1".equals(userVO.getVisible())) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "账户已停用!");
+            return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "账户已停用。");
         } else if (!userVO.getPassword().equals(password)) {
             //记录登录错误日志
             po.setUserId(userVO.getId());
@@ -321,7 +317,6 @@ public class SignController {
      * @return token 信息
      */
     @RequestMapping("/refreshToken")
-    @ResponseBody
     public ResponseBodyVO<SimulationTokenVO> refreshToken(@RequestBody @Validated SignRefreshParameter signRefreshParameter) {
         String refreshToken = signRefreshParameter.getRefreshToken();
         //刷新令牌
@@ -345,7 +340,6 @@ public class SignController {
      * 服务监控
      */
     @RequestMapping("online")
-    @ResponseBody
     public ResponseBodyVO<Integer> online() {
         int online;
 

simulation-resource-server/src/main/java/com/css/simulation/resource/model/controller/VehicleCtrl.java

@@ -18,7 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping(value = "/vehicle", name = LogConstants.MODULE_VEHICLE)
@@ -52,6 +51,7 @@ public class VehicleCtrl {
     public ResponseBodyVO<List<VehicleGSVO>> getMyVehicleListNew() {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, vehicleService.getMyVehicleListNew());
     }
+
     /**
      * 获取公私有列表
      */
@@ -105,11 +105,7 @@ public class VehicleCtrl {
     @RequestMapping("/delVehicleById")
     public ResponseBodyVO<String> delVehicleById(@RequestBody VehiclePO vehiclePO) {
         int i = vehicleService.delVehicleById(vehiclePO);
-        if (i > 0) {
-            return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
-        } else {
-            return new ResponseBodyVO<>(false, 500, "删除失败！", null);
-        }
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS);
     }
 
     @PostMapping(value = "/parsePar", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)

simulation-resource-server/src/main/java/com/css/simulation/resource/project/impl/SimulationProjectServiceImpl.java

@@ -2880,6 +2880,7 @@ public class SimulationProjectServiceImpl implements SimulationProjectService {
             }
         }
         document.add(pdfPTable3);
+        document.close();
     }
 
 

simulation-resource-server/src/main/java/com/css/simulation/resource/project/service/SimulationProjectService.java

@@ -11,68 +11,35 @@ import java.util.List;
 public interface SimulationProjectService {
 
     ResponseBodyVO<String> addOrUpdateProject(SimulationManualProjectParam param);
-
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectProject(SimulationManualProjectParam param);
-
     ResponseBodyVO<SimulationManualProjectSingleVo> selectProjectById(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> deleteProjectByids(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> updateProjectNowRunState(SimulationManualProjectParam param);
-
     ResponseBodyVO<ProjectDetailsVo> selectProjectDetailsById(SimulationManualProjectParam param);
-
     ResponseBodyVO<ProjectReportVo> selectProjectReportById(SimulationManualProjectParam param);
-
     ResponseBodyVO<List<DropDownTypeVo>> selectDropDownByType(SimulationManualProjectParam param);
     ResponseBodyVO<List<DropDownTypeNewVo>> selectDropDownByTypeNew(SimulationManualProjectParam param);
-
     ResponseBodyVO<ProjectTaskDetailsVo> selectProjectTaskById(SimulationManualProjectParam param);
     String getDictName(String type, String code);
-
     ResponseBodyVO analysisVehicleCoord() throws Exception;
-
     ResponseBodyVO selectProjectTaskList(SimulationManualProjectParam param);
-
     ResponseBodyVO selectRunTaskByState();
-
     ResponseBodyVO selectRunProjectByState();
-
     ResponseBodyVO selectEvaluationLevel();
-
     void exportProjectReport(SimulationManualProjectParam param);
-
-    //根据算法id获取最新的一条报告id
     String selectProjectReportIdByAlgorithmId(String algorithmId);
-
-    // 生成保存评价等级
     ResponseBodyVO<String> saveEvaluationLevel(String id);
-
-    //仿真结果保存到数据库
     ResponseBodyVO saveTaskResult(SimulationManualProjectParam param);
-
     void exportProjectTaskFileById(SimulationManualProjectParam param);
-
     void exportProjectReportAndTaskFileById(SimulationManualProjectParam param);
-
     ResponseBodyVO addOrUpdateAutomaticProject(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> deleteAutomaticProjectByids(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> updateAutomaticRunState(SimulationManualProjectParam param);
-
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectAutomaticProject(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> createAutomaticSubProject(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> deleteAutomaticSubProjectByIds(SimulationManualProjectParam param);
-
     ResponseBodyVO<AutomaticProjectVo> selectSubProjectInfo(SimulationManualProjectParam param);
-
     ResponseBodyVO<PageInfo<SimulationManualProjectVo>> selectSubProjectList(SimulationManualProjectParam param);
-
     ResponseBodyVO<SimulationManualProjectSingleVo> selectAutomaticProjectById(SimulationManualProjectParam param);
-
     ResponseBodyVO<String> updateAutoProjectNowRunState(SimulationManualProjectParam param);
-
 }