Merge branch 'master' of http://git.jiayuepowertech.com:9022/zhangchenglong/calculate

src/main/java/com/syjy/calculate/conotroller/JarCalculate.java

@@ -27,69 +27,58 @@ public class JarCalculate {
     @Autowired
     CalculationFormulaRepository calculationFormulaRepository;
 
-   @GetMapping("test")
+    @GetMapping("select")
     @ResponseBody
-    public String test() {
-        String aa = "1112";
-        return aa;
-    }
-  @GetMapping("select")
-    @ResponseBody
-    public  List<CalculationFormula> select() {
-      String sql = "SELECT * from t_calculation_formula";
-
-      List<CalculationFormula> calculationFormulaList = new ArrayList<>();
-      try {
-          calculationFormulaList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CalculationFormula.class));
-      } catch (DataAccessException e) {
-          e.printStackTrace();
-      }
+    public List<CalculationFormula> select() {
+        String sql = "SELECT * from t_calculation_formula";
+        List<CalculationFormula> calculationFormulaList = new ArrayList<>();
+        try {
+            calculationFormulaList = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(CalculationFormula.class));
+        } catch (DataAccessException e) {
+            e.printStackTrace();
+        }
         return calculationFormulaList;
     }
+
     @PostMapping("edit")
     @ResponseBody
-    public String edit(@RequestBody CalculationFormula calculationFormula ) {
-
-        Integer id =calculationFormula.getId();
-        String type =calculationFormula.getType();
-        Integer orderNo =calculationFormula.getOrderNo();
-        String formula =calculationFormula.getFormula();
-        String province =calculationFormula.getProvinceEnum();
-        String state =calculationFormula.getState();
+    public String edit(@RequestBody CalculationFormula calculationFormula) {
+        Integer id = calculationFormula.getId();
+        String type = calculationFormula.getType();
+        Integer orderNo = calculationFormula.getOrderNo();
+        String formula = calculationFormula.getFormula();
+        String province = calculationFormula.getProvinceEnum();
+        String state = calculationFormula.getState();
         try {
-        jdbcTemplate.update("update t_calculation_formula set type=?,orderNo=?,formula=?,province_enum=?,state=? where id=?", type, orderNo, formula,province,state,id);
+            jdbcTemplate.update("update t_calculation_formula set type=?,orderNo=?,formula=?,province_enum=?,state=? where id=?", type, orderNo, formula, province, state, id);
         } catch (DataAccessException e) {
             e.printStackTrace();
         }
-        return "修改成功" ;
+        return "修改成功";
     }
+
     @PostMapping("add")
     @ResponseBody
     public String add(@RequestBody CalculationFormula calculationFormula) {
-        System.out.println("sss"+calculationFormula);
-
-        String type =calculationFormula.getType();
-        Integer orderNo =calculationFormula.getOrderNo();
-        String formula =calculationFormula.getFormula();
-        String province_enum =calculationFormula.getProvinceEnum();
-
-
-
+        String type = calculationFormula.getType();
+        Integer orderNo = calculationFormula.getOrderNo();
+        String formula = calculationFormula.getFormula();
+        String province_enum = calculationFormula.getProvinceEnum();
         try {
             jdbcTemplate.update(
-                    "INSERT INTO t_calculation_formula(TYPE,ORDERNO,FORMULA,PROVINCE_ENUM) VALUES (?, ?,?,?)",type,orderNo,formula,province_enum
-               );
+                    "INSERT INTO t_calculation_formula(TYPE,ORDERNO,FORMULA,PROVINCE_ENUM) VALUES (?, ?,?,?)", type, orderNo, formula, province_enum
+            );
         } catch (DataAccessException e) {
             e.printStackTrace();
         }
-        return "新增成功" ;
+        return "新增成功";
     }
 
-    @PostMapping( "delet")
+    @PostMapping("delet")
     @ResponseBody
     public String delete(@RequestBody CalculationFormula calculationFormula) {
-        System.out.println("id"+calculationFormula.getId());
-    Integer id =calculationFormula.getId();
+        System.out.println("id" + calculationFormula.getId());
+        Integer id = calculationFormula.getId();
         try {
             jdbcTemplate.update("delete from t_calculation_formula where id=?", id);
         } catch (DataAccessException e) {
@@ -97,5 +86,4 @@ public class JarCalculate {
         }
         return "删除成功";
     }
-
 }

src/main/java/com/syjy/calculate/exception/BusinessException.java

@@ -1,30 +0,0 @@
-package com.syjy.calculate.exception;
-
-import lombok.NoArgsConstructor;
-
-/**
- * 业务异常
- *
- * @author zzy
- * @version 2.0
- * @since 2018/10/11 11:08
- */
-@NoArgsConstructor
-public class BusinessException extends Exception{
-
-    public BusinessException(String message) {
-        super(message);
-    }
-
-    public BusinessException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public BusinessException(Throwable cause) {
-        super(cause);
-    }
-
-    public BusinessException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

src/main/resources/sql/t_calculation_formula.sql

@@ -1,17 +1,17 @@
 /*
  Navicat Premium Data Transfer
 
- Source Server         : local
+ Source Server         : localhost_3306
  Source Server Type    : MySQL
- Source Server Version : 80029
+ Source Server Version : 80028
  Source Host           : localhost:3306
  Source Schema         : ipfcst-v3
 
  Target Server Type    : MySQL
- Target Server Version : 80029
+ Target Server Version : 80028
  File Encoding         : 65001
 
- Date: 06/09/2022 10:48:41
+ Date: 06/09/2022 16:35:25
 */
 
 SET NAMES utf8mb4;
@@ -35,7 +35,7 @@ CREATE TABLE `t_calculation_formula`  (
   `LAST_MODIFIER` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改时间',
   `LAST_MODIFY_TIME` datetime(0) NULL DEFAULT NULL COMMENT '修改人',
   PRIMARY KEY (`ID`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 132 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of t_calculation_formula
@@ -171,5 +171,25 @@ INSERT INTO `t_calculation_formula` VALUES (128, 'POINT_ULTRA_SHORT_ACCURACY', 2
 INSERT INTO `t_calculation_formula` VALUES (129, 'POINT_ULTRA_SHORT_ACCURACY', 3, '(1-(2*result2))*100', 'E64', 'E2', NULL, NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (130, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E61', 'E2', 'POINT_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
 INSERT INTO `t_calculation_formula` VALUES (131, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E61', 'E2', 'POINT_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (132, 'RULES', 1, 'IF(cap<0,\'pass\')', 'E61', 'E2', 'POINT_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (133, 'RULES', 1, 'IF(cap<0,\'pass\')', 'E41', 'E2', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (134, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E32', 'E1', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (135, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E32', 'E2', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (136, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E33', 'E1', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (137, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E33', 'E2', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (138, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E34', 'E1', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (139, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E34', 'E2', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (140, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E62', 'E2', 'POINT_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (141, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E62', 'E2', 'POINT_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (142, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E63', 'E2', 'POINT_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (143, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E63', 'E2', 'POINT_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (144, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E63', 'E2', 'POINT_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (145, 'RULES', 1, 'IF(yc=0,IF(sj<=rl*0.03,\'不予考核\',\'0%\'),IF(sj=0,IF(YC<=rl*0.03,\'不予考核\',\'0%\'),\'pass\'))', 'E63', 'E2', 'POINT_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (146, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E32', 'E1', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (147, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E32', 'E2', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (148, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E33', 'E1', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (149, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E33', 'E2', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (150, 'RULES', 1, 'IF(sj=0,\'sj=0.01\')', 'E34', 'E1', 'DAY_ULTRA_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `t_calculation_formula` VALUES (151, 'RULES', 1, 'IF(sj<10,\'pass\')', 'E34', 'E2', 'DAY_SHORT_ACCURACY', NULL, NULL, NULL, NULL, NULL);
 
 SET FOREIGN_KEY_CHECKS = 1;