参数

smarking/src/main/java/com/xhkjedu/smarking/controller/report/MsrReportparamController.java

@@ -0,0 +1,58 @@
+package com.xhkjedu.smarking.controller.report;
+
+import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import com.xhkjedu.smarking.service.report.reportother.MsrReportparamService;
+import com.xhkjedu.smarking.vo.report.reportother.ReportParams;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @Description：考试报告参数
+ * @Author: WN
+ * @Date: 2024/12/9 15:08:10
+ **/
+@RestController
+@RequestMapping("/rpe")
+public class MsrReportparamController {
+    @Resource
+    MsrReportparamService msrReportparamService;
+    /*
+     * @Description 考试参数-保存
+     * @Date 2024/12/9 15:10:45
+     * @Author WN
+     * @Param [reportparam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/save")
+    public ResultVo save(@RequestBody ReportParams reportparam) {
+        N_Utils.validation(new Object[]{reportparam.getExamid(), "考试id", 1,reportparam.getRpbelong(),"归属菜单",2});
+
+        if(reportparam.getParams() == null || reportparam.getParams().isEmpty()){
+            return new ResultVo(1, "参数不能为空");
+        }
+
+        msrReportparamService.saveReportparam(reportparam);
+        return new ResultVo(0, "保存成功");
+    }
+
+    /*
+     * @Description 保存参数
+     * @Date 2024/12/9 15:12:07
+     * @Author WN
+     * @Param [gradeparam]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody ReportParams gradeparam) {
+        N_Utils.validation(new Object[]{gradeparam.getExamid(), "考试id", 1,gradeparam.getRpbelong(),"归属菜单",2});
+        List<MsrReportparam> rtnParams = msrReportparamService.listReportparamByRpbelong(gradeparam.getRpbelong(),gradeparam.getExamid());
+        return new ResultVo(0, "获取成功",rtnParams);
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/controller/wholeparam/MspReportparamController.java

@@ -1,7 +1,7 @@
 package com.xhkjedu.smarking.controller.wholeparam;
 
 import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
-import com.xhkjedu.smarking.service.wholeparam.MspGradeparamService;
+import com.xhkjedu.smarking.service.wholeparam.MspReportparamService;
 import com.xhkjedu.smarking.vo.wholeparam.GradeParams;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
@@ -20,9 +20,9 @@ import java.util.List;
  **/
 @RestController
 @RequestMapping("/rparam")
-public class MspGradeparamController {
+public class MspReportparamController {
     @Resource
-    private MspGradeparamService mspGradeparamService;
+    private MspReportparamService mspReportparamService;
 
     /*
      * @Description 保存
@@ -41,7 +41,7 @@ public class MspGradeparamController {
             return new ResultVo(1, "参数不能为空");
         }
 
-        mspGradeparamService.saveGradeparam(gradeparam);
+        mspReportparamService.saveGradeparam(gradeparam);
         return new ResultVo(0, "保存成功",gradeparam);
     }
 
@@ -58,7 +58,7 @@ public class MspGradeparamController {
         if(gradeparam.getGradeid() == null){
             return new ResultVo(1, "年级不能为空");
         }
-        List<MspReportparam> rtnParams = mspGradeparamService.getMspGradeparam(gradeparam);
+        List<MspReportparam> rtnParams = mspReportparamService.getMspGradeparam(gradeparam);
         return new ResultVo(0, "保存成功",rtnParams);
     }
 

smarking/src/main/java/com/xhkjedu/smarking/mapper/report/reportother/MsrReportparamMapper.java

@@ -2,6 +2,9 @@ package com.xhkjedu.smarking.mapper.report.reportother;
 
 import com.xhkjedu.base.TkMapper;
 import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @Description 阅卷指标参数-考试报告参数表 Mapper 接口
@@ -9,4 +12,10 @@ import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
  * @Date 2024-12-09
  */
 public interface MsrReportparamMapper extends TkMapper<MsrReportparam> {
+
+    //获取考试指定图例对应参数
+    List<MsrReportparam> listReportparamByRpbelong(@Param("rpbelong") String rpbelong,@Param("examid") Integer examid);
+
+    //批量删除
+    int deleteBatchReportparam(@Param("list") List<Integer> list);
 }

smarking/src/main/java/com/xhkjedu/smarking/mapper/wholeparam/MspReportparamMapper.java

@@ -12,7 +12,7 @@ import java.util.List;
  * @Author: WN
  * @Date: 2024/12/2 16:14:48
  **/
-public interface MspGradeparamMapper extends TkMapper<MspReportparam> {
+public interface MspReportparamMapper extends TkMapper<MspReportparam> {
 
     //获取学校年级下指定模块参数
     List<MspReportparam> getGradeParamByGradeAndBelong(@Param("gp") GradeParams gp);

smarking/src/main/java/com/xhkjedu/smarking/service/report/reportother/MsrReportparamService.java

@@ -0,0 +1,121 @@
+package com.xhkjedu.smarking.service.report.reportother;
+
+import com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper;
+import com.xhkjedu.smarking.mapper.wholeparam.MspReportparamMapper;
+import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
+import com.xhkjedu.smarking.vo.report.reportother.ReportParams;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @Description：考试参数
+ * @Author: WN
+ * @Date: 2024/12/9 14:13:17
+ **/
+@Service
+public class MsrReportparamService {
+    @Resource
+    private MsrReportparamMapper msrReportparamMapper;
+    @Resource
+    private MspReportparamMapper mspReportparamMapper;
+
+
+    /*
+     * @Description 考试参数--保存
+     * @Date 2024/12/9 14:55:30
+     * @Author WN
+     * @Param [reportParams]
+     * @Return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void saveReportparam(ReportParams reportParams) {
+        List<MsrReportparam> originalParams = msrReportparamMapper.listReportparamByRpbelong(reportParams.getRpbelong(), reportParams.getExamid());
+
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        List<MsrReportparam> params = reportParams.getParams();
+        List<Integer> delids = new ArrayList<>();
+        for(MsrReportparam param : params) {
+            param.setRpbelong(reportParams.getRpbelong());
+            param.setExamid(reportParams.getExamid());
+            param.setHandleid(reportParams.getHandleid());
+            param.setHandletime(timestamp);
+            if(param.getRptype() == null) param.setRptype(0);
+            if(param.getGradenum() == null) param.setGradenum(0);
+
+            //如果同类型同科目的数据已存在，删除原数据
+            if(originalParams!= null && originalParams.size() > 0) {
+                MsrReportparam oldParam;
+                if(N_Utils.isNotEmpty(param.getSubjectid())){
+                    oldParam = originalParams.stream().filter(p -> param.getRptype().equals(p.getRptype()) && param.getSubjectid().equals(p.getSubjectid())).findFirst().orElse(null);
+                }else{
+                    oldParam = originalParams.stream().filter(p -> param.getRptype().equals(p.getRptype())).findFirst().orElse(null);
+                }
+                if(oldParam!= null) {
+                    delids.add(oldParam.getRpid());
+                }
+            }
+        }
+        if(delids.size() > 0) {
+            msrReportparamMapper.deleteBatchReportparam(delids);
+        }
+
+        msrReportparamMapper.insertList(params);
+    }
+
+    /*
+     * @Description 考试参数--获取
+     * @Date 2024/12/9 14:56:14
+     * @Author WN
+     * @Param [rpbelong, examid]
+     * @Return java.util.List<com.xhkjedu.smarking.model.report.reportother.MsrReportparam>
+     **/
+    public List<MsrReportparam> listReportparamByRpbelong(String rpbelong, Integer examid) {
+        return msrReportparamMapper.listReportparamByRpbelong(rpbelong, examid);
+    }
+
+    /*
+     * @Description 初始化参数
+     * @Date 2024/12/9 15:06:42
+     * @Author WN
+     * @Param [schoolid, gradeid, examid, handleid]
+     * @Return void
+     **/
+    public void initReportparam(Integer schoolid,Integer gradeid,Integer examid,Integer handleid) {
+        List<MspReportparam> mspParams = mspReportparamMapper.listAllByGrade(schoolid,gradeid);
+        List<MsrReportparam> saveParams = new ArrayList<>();
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        //按类型进行分组
+        Map<String,List<MspReportparam>> mspParamMap = mspParams.stream().collect(Collectors.groupingBy(MspReportparam::getRpbelong));
+        for (Map.Entry<String, List<MspReportparam>> entry : mspParamMap.entrySet()) {
+            List<MspReportparam> params = entry.getValue();
+            //获取对应年级的
+            List<MspReportparam> gradeParams = params.stream().filter(p -> p.getGradeid().equals(gradeid)).collect(Collectors.toList());
+            if(gradeParams == null || gradeParams.size() == 0){
+                gradeParams = params;
+            }
+
+            //说明对应年级下有设置
+            for(MspReportparam param : gradeParams){
+                MsrReportparam rp = new MsrReportparam();
+                rp.setExamid(examid);
+                rp.setRpbelong(entry.getKey());
+                rp.setRptype(param.getRptype());
+                rp.setGradenum(param.getGradenum());
+                rp.setSubjectid(param.getSubjectid());
+                rp.setSzjson(param.getSzjson());
+                rp.setHandletime(timestamp);
+                rp.setHandleid(handleid);
+                saveParams.add(rp);
+            }
+        }
+        msrReportparamMapper.insertList(saveParams);
+    }
+}

smarking/src/main/java/com/xhkjedu/smarking/service/wholeparam/MspReportparamService.java

@@ -1,6 +1,6 @@
 package com.xhkjedu.smarking.service.wholeparam;
 
-import com.xhkjedu.smarking.mapper.wholeparam.MspGradeparamMapper;
+import com.xhkjedu.smarking.mapper.wholeparam.MspReportparamMapper;
 import com.xhkjedu.smarking.model.wholeparam.MspReportparam;
 import com.xhkjedu.smarking.vo.wholeparam.GradeParams;
 import com.xhkjedu.utils.N_Utils;
@@ -17,9 +17,9 @@ import java.util.List;
  * @Date: 2024/12/2 16:19:44
  **/
 @Service
-public class MspGradeparamService {
+public class MspReportparamService {
     @Resource
-    private MspGradeparamMapper mspGradeparamMapper;
+    private MspReportparamMapper mspReportparamMapper;
 
     /*
      * @Description 保存参数
@@ -30,7 +30,7 @@ public class MspGradeparamService {
      **/
     @Transactional(rollbackFor = Exception.class)
     public void saveGradeparam(GradeParams gradeParams) {
-        List<MspReportparam> originalParams = mspGradeparamMapper.getGradeParamByGradeAndBelong(gradeParams);
+        List<MspReportparam> originalParams = mspReportparamMapper.getGradeParamByGradeAndBelong(gradeParams);
 
         Integer timestamp = N_Utils.getSecondTimestamp();
         List<MspReportparam> params = gradeParams.getParams();
@@ -58,11 +58,10 @@ public class MspGradeparamService {
             }
         }
         if(delids.size() > 0) {
-            mspGradeparamMapper.deleteGradeparam(delids);
+            mspReportparamMapper.deleteGradeparam(delids);
         }
 
-        mspGradeparamMapper.insertList(params);
-
+        mspReportparamMapper.insertList(params);
     }
 
     /*
@@ -73,6 +72,6 @@ public class MspGradeparamService {
      * @Return com.xhkjedu.smarking.model.wholeparam.MspGradeparam
      **/
     public List<MspReportparam> getMspGradeparam(GradeParams mspGradeparam) {
-        return mspGradeparamMapper.getGradeParamByGradeAndBelong(mspGradeparam);
+        return mspReportparamMapper.getGradeParamByGradeAndBelong(mspGradeparam);
     }
 }

smarking/src/main/java/com/xhkjedu/smarking/vo/report/reportother/ReportParams.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.smarking.vo.report.reportother;
+
+import com.xhkjedu.smarking.model.report.reportother.MsrReportparam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description：报告参数
+ * @Author: WN
+ * @Date: 2024/12/9 14:25:28
+ **/
+@Data
+public class ReportParams {
+    //考试ID
+    private Integer examid;
+
+    //归属：allrate班级对比表综合率  gradescore分档分数线 nearline临界生群体分析 subjectshow学科考试表现
+    //  keystu重点学生信息
+    private String rpbelong;
+
+    //操作人ID
+    private Integer handleid;
+
+    private List<MsrReportparam> params;//所有参数集合
+}

smarking/src/main/resources/application.properties

@@ -3,8 +3,8 @@ server.port=8090
 spring.application.name=smarking
 #\u6CE8\u518C\u5230\u6211\u4EEC\u672C\u5730\u7684eureka\u6CE8\u518C\u4E2D\u5FC3\uFF0C\u7AEF\u53E38081
 eureka.client.service-url.defaultZone=http://xhschool:Xhkjedud07@127.0.0.1:8081/eureka/
-eureka.client.register-with-eureka=true
-eureka.client.fetch-registry=true
+eureka.client.register-with-eureka=false
+eureka.client.fetch-registry=false
 #\u8BBE\u7F6Eeureka\u8F93\u51FA\u65E5\u5FD7\u7EA7\u522B
 logging.level.com.netflix=error
 

smarking/src/main/resources/mapper/report/reportother/MsrReportparamMapper.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.smarking.mapper.report.reportother.MsrReportparamMapper">
+
+    <!--获取考试对应参数-->
+    <select id="listReportparamByRpbelong" resultType="com.xhkjedu.smarking.model.report.reportother.MsrReportparam">
+        select * from msr_reportparam where examid=#{examid} and rpbelong = #{rpbelong}
+    </select>
+
+    <!--删除-->
+    <delete id="deleteBatchReportparam">
+        delete from msp_reportparam where rpid in
+        <foreach collection="list" item="rpid" open="(" separator="," close=")">#{rpid}</foreach>
+    </delete>
 </mapper>

smarking/src/main/resources/mapper/wholeparam/MspReportparamMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xhkjedu.smarking.mapper.wholeparam.MspGradeparamMapper">
+<mapper namespace="com.xhkjedu.smarking.mapper.wholeparam.MspReportparamMapper">
 
     <!--获取学校年级下指定模块参数-->
     <select id="getGradeParamByGradeAndBelong" resultType="com.xhkjedu.smarking.model.wholeparam.MspReportparam">