sdsadad

src/main/java/com/template/api/SmartEvaluateTeacherControllerAPI.java

@@ -2,13 +2,16 @@ package com.template.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.template.model.evaluate.teacher.SmartEvaluateTeacher;
+import com.template.model.request.addChildScoreManageRequest;
+import com.template.model.request.addScoreManageRequest;
+import com.template.model.request.updateScoreManageRequest;
+import com.template.model.request.useridsRequest;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -16,6 +19,46 @@ import javax.servlet.http.HttpServletResponse;
 @Api(tags = {"SmartEvaluateTeacherControllerAPI"}, value = "综合素质")
 public interface SmartEvaluateTeacherControllerAPI {
 
+    /**
+     * 添加项按钮
+     * @param asmr
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping(value = "/addScoreManage")
+    @ApiOperation(value = "添加项按钮", httpMethod = "POST")
+    CommonResult addScoreManage(@Validated @RequestBody addScoreManageRequest asmr, BindingResult bindingResult);
+
+    /**
+     * 添加子项按钮
+     * @param acsmr
+     * @param bindingResult
+     * @return
+     */
+    @PostMapping(value = "/addChildScoreManage")
+    @ApiOperation(value = "添加子项按钮", httpMethod = "POST")
+    CommonResult addChildScoreManage(@Validated @RequestBody addChildScoreManageRequest acsmr, BindingResult bindingResult);
+
+    /**
+     * 编辑按钮
+     * @param usmr
+     * @return
+     */
+    @PostMapping(value = "/updateScoreManage")
+    @ApiOperation(value = "编辑按钮", httpMethod = "POST")
+    CommonResult updateScoreManage(@Validated @RequestBody updateScoreManageRequest usmr, BindingResult bindingResult);
+
+    /**
+     * 删除按钮
+     * @param id 数据ID
+     * @return
+     */
+    @GetMapping(value = "/deleteScoreManage")
+    @ApiOperation(value = "删除按钮", httpMethod = "GET")
+    CommonResult deleteScoreManage(@RequestParam int id);
+
+
+
     @RequestMapping(value = "/operateSmartScoreManage")
     @ApiOperation(value = "评分项目管理", httpMethod = "POST")
     CommonResult operateSmartScoreManage(@Validated @RequestBody JSONObject jsonObject);

src/main/java/com/template/api/SmartSemesterControllerAPI.java

@@ -22,6 +22,10 @@ public interface SmartSemesterControllerAPI {
     @ApiOperation(value = "添加学期", notes = "添加学期数据", httpMethod = "POST")
     CommonResult insertSmartSemester(@Validated @RequestBody SmartSemester smartApply, BindingResult bindingResult) throws Exception;
 
+    @GetMapping(value = "/testSmartSemester")
+    @ApiOperation(value = "添加学期", notes = "添加学期数据", httpMethod = "GET")
+    CommonResult testSmartSemester(int id) throws Exception;
+
     @PostMapping(value = "/updateSmartSemesterById")
     @ApiOperation(value = "编辑学期数据", notes = "编辑学期数据", httpMethod = "POST")
     CommonResult updateSmartSemesterById(@Validated @RequestBody SmartSemester ra, BindingResult bindingResult);

src/main/java/com/template/controller/SmartEvaluateTeacherController.java

@@ -9,8 +9,13 @@ import com.template.annotation.PassToken;
 import com.template.api.SmartEvaluateTeacherControllerAPI;
 import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.UUIDUtil;
+import com.template.common.utils.paramUtils;
 import com.template.model.evaluate.teacher.*;
+import com.template.model.pojo.SmartScore;
 import com.template.model.pojo.SmartSemester;
+import com.template.model.request.addChildScoreManageRequest;
+import com.template.model.request.addScoreManageRequest;
+import com.template.model.request.updateScoreManageRequest;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.EvaluateTeacherVo;
@@ -25,6 +30,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
@@ -48,6 +54,133 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
     SmartSemesterService smartSemesterService;
 
 
+    @Override
+    public CommonResult addScoreManage(addScoreManageRequest asmr, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        SmartSemester semester = smartSemesterService.getSmartById(asmr.getTermId());
+        if (semester == null) {
+            return CommonResult.fail("学期数据为空，添加评分项失败");
+        }
+
+        List<SmartScoreManage> ssm = smartScoreManageService.queryDatasByTermId(asmr.getTermId());
+        if (ssm != null && ssm.size() > 0) {
+            long exist = ssm.stream().filter(e -> e.getParentId().intValue() == 0 && e.getScoreItem().equals(asmr.getScoreItem())).count();
+            if (exist > 0) {
+                return CommonResult.fail("存在重复主项");
+            }
+        }
+
+        SmartScoreManage parentData = new SmartScoreManage();
+        parentData.setTermId(asmr.getTermId());
+        parentData.setTerm(semester.getName());
+        parentData.setScoreItem(asmr.getScoreItem());
+        parentData.setParentId(0);
+        parentData.setScoreNum(asmr.getScoreNum());
+        int insertResult = smartScoreManageService.insertSmartScoreManage(parentData);
+        if (insertResult <= 0) {
+            return CommonResult.fail("添加项失败");
+        }
+        SmartScoreManage childData = new SmartScoreManage();
+        childData.setTermId(asmr.getTermId());
+        childData.setTerm(semester.getName());
+        childData.setScoreItem(asmr.getScoreChildItem());
+        childData.setParentId(insertResult);
+        childData.setScoreNum(asmr.getScoreNum());
+        int insertChildResult = smartScoreManageService.insertSmartScoreManage(childData);
+        if (insertChildResult <= 0) {
+            return CommonResult.fail("添加子项失败");
+        }
+        return CommonResult.ok("添加成功");
+    }
+
+    @Override
+    public CommonResult addChildScoreManage(addChildScoreManageRequest acsmr, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        SmartSemester semester = smartSemesterService.getSmartById(acsmr.getTermId());
+        if (semester == null) {
+            return CommonResult.fail("学期数据为空，添加评分项失败");
+        }
+
+        //根据父级ID获取父级下所有子级数据
+        List<SmartScoreManage> childDatas = smartScoreManageService.queryDatasByParentId(acsmr.getId());
+        if(childDatas != null && childDatas.size() > 0){
+            long exist = childDatas.stream().filter(e -> e.getScoreItem().equals(acsmr.getScoreItem())).count();
+            if(exist > 0){
+                return CommonResult.fail("存在重复子项");
+            }
+        }
+
+        SmartScoreManage parentData = new SmartScoreManage();
+        parentData.setTermId(acsmr.getTermId());
+        parentData.setTerm(semester.getName());
+        parentData.setScoreItem(acsmr.getScoreItem());
+        parentData.setParentId(acsmr.getId());
+        parentData.setScoreNum(acsmr.getScoreNum());
+        int insertResult = smartScoreManageService.insertSmartScoreManage(parentData);
+        if (insertResult <= 0) {
+            return CommonResult.fail("添加子项失败");
+        }
+
+        return CommonResult.ok("添加成功");
+    }
+
+    @Override
+    public CommonResult updateScoreManage(updateScoreManageRequest usmr, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            String st = paramUtils.getParamError(bindingResult);
+            return CommonResult.fail(st);
+        }
+
+        SmartScoreManage data = smartScoreManageService.getSmartScoreManageById(usmr.getId());
+        if(data == null){
+            return CommonResult.fail("数据已失效，编辑失败");
+        }
+
+        //根据父级ID获取父级下所有子级数据
+        List<SmartScoreManage> childDatas = smartScoreManageService.queryDatasByParentId(data.getParentId());
+        if(childDatas != null && childDatas.size() > 0){
+            long exist = childDatas.stream().filter(e -> e.getScoreItem().equals(usmr.getScoreItem()) && e.getId().intValue() != usmr.getId().intValue()).count();
+            if(exist > 0){
+                return CommonResult.fail("存在重复子项");
+            }
+        }
+
+        data.setScoreItem(usmr.getScoreItem());
+        data.setScoreNum(usmr.getScoreNum());
+
+        int updateData = smartScoreManageService.updateSmartScoreManage(data);
+        if(updateData <= 0){
+            return CommonResult.fail("编辑失败");
+        }
+
+        return CommonResult.ok("编辑成功");
+    }
+
+    @Override
+    public CommonResult deleteScoreManage(int id) {
+        SmartScoreManage data = smartScoreManageService.getSmartScoreManageById(id);
+        if(data == null){
+            return CommonResult.fail("数据已失效，删除失败");
+        }
+        int result = smartScoreManageService.deleteSmartScoreManageById(id);
+        if(result <= 0){
+            return CommonResult.fail("删除失败");
+        }
+
+        return CommonResult.ok("删除成功");
+    }
+
+
+
+
     @PassToken
     public CommonResult operateSmartScoreManage(JSONObject jsonObject) {
         SimpleScore simpleScoreLists = null;
@@ -237,13 +370,13 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
             List<SmartEvaluateTdetail> updateDetails = new ArrayList<>();
             //查找明细smart_evaluate_tdetail
             List<SmartEvaluateTdetail> tdetails = smartEvaluateTdetailService.queryTdetailsByTermUserId(teacher.getTermId(), teacher.getUserId());
-            for (SmartEvaluateTdetailList ssl:simpleEvaluateScore.getSimpleScoreList()) {
-                for (SmartEvaluateTdetailList sc:ssl.getEvaluateList()) {
+            for (SmartEvaluateTdetailList ssl : simpleEvaluateScore.getSimpleScoreList()) {
+                for (SmartEvaluateTdetailList sc : ssl.getEvaluateList()) {
                     Optional<SmartEvaluateTdetail> oStdetail = tdetails.stream().filter(e -> e.getScoreManageId().equals(sc.getId())).findFirst();
-                    if(oStdetail != null && oStdetail.isPresent()){
+                    if (oStdetail != null && oStdetail.isPresent()) {
                         oStdetail.get().setOwnNum(sc.getOwnNum());
                         updateDetails.add(oStdetail.get());
-                    }else{
+                    } else {
                         SmartEvaluateTdetail nDetail = new SmartEvaluateTdetail();
                         nDetail.setScoreManageId(sc.getId());
                         nDetail.setTermId(teacher.getTermId());
@@ -262,16 +395,16 @@ public class SmartEvaluateTeacherController implements SmartEvaluateTeacherContr
                 throw new Exception("教师评分数据更新失败！");
             }
 
-            if(newDetails != null && newDetails.size() > 0){
+            if (newDetails != null && newDetails.size() > 0) {
                 boolean insertDetail = smartEvaluateTdetailService.saveBatch(newDetails);
-                if(!insertDetail){
+                if (!insertDetail) {
                     return CommonResult.fail("评价明细数据添加失败");
                 }
             }
 
-            if(updateDetails != null && updateDetails.size() > 0){
+            if (updateDetails != null && updateDetails.size() > 0) {
                 boolean updateDetail = smartEvaluateTdetailService.updateBatchById(updateDetails);
-                if(!updateDetail){
+                if (!updateDetail) {
                     return CommonResult.fail("评价明细数据更新失败");
                 }
             }

src/main/java/com/template/controller/SmartSemesterController.java

@@ -284,6 +284,206 @@ public class SmartSemesterController implements SmartSemesterControllerAPI {
         return CommonResult.ok("添加成功");
     }
 
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public CommonResult testSmartSemester(int id) throws Exception {
+
+        SmartSemester smartApply = smartSemesterService.getSmartById(id);
+
+        try{
+            int result = smartApply.getId();
+
+            //region 添加对应的默认教师评分项
+            List<SmartScoreManage> scoreManages = new ArrayList<>();
+            //region 德
+            SmartScoreManage morals = new SmartScoreManage();
+            morals.setTermId(result);
+            morals.setTerm(smartApply.getName());
+            morals.setScoreItem("德");
+            morals.setParentId(0);
+            morals.setScoreNum(12.0);
+            scoreManages.add(morals);
+            //endregion
+            //region 能
+            SmartScoreManage ability = new SmartScoreManage();
+            ability.setTermId(result);
+            ability.setTerm(smartApply.getName());
+            ability.setScoreItem("能");
+            ability.setParentId(0);
+            ability.setScoreNum(28.0);
+            scoreManages.add(ability);
+            //endregion
+            //region 勤
+            SmartScoreManage diligent = new SmartScoreManage();
+            diligent.setTermId(result);
+            diligent.setTerm(smartApply.getName());
+            diligent.setScoreItem("勤");
+            diligent.setParentId(0);
+            diligent.setScoreNum(6.0);
+            scoreManages.add(diligent);
+            //endregion
+            //region 绩
+            SmartScoreManage merit = new SmartScoreManage();
+            merit.setTermId(result);
+            merit.setTerm(smartApply.getName());
+            merit.setScoreItem("绩");
+            merit.setParentId(0);
+            merit.setScoreNum(54.0);
+            scoreManages.add(merit);
+            //endregion
+            boolean inserSManages = smartScoreManageService.saveBatch(scoreManages);
+            if (!inserSManages) {
+                //return CommonResult.fail("添加失败");
+                throw new Exception("添加失败！");
+            }
+
+            List<SmartScoreManage> scoreManagesData = smartScoreManageService.queryDatasByTermId(result);
+
+            List<SmartScoreManage> scoreManageDetails = new ArrayList<>();
+            for (SmartScoreManage data : scoreManagesData) {
+                switch (data.getScoreItem()) {
+                    case "德":
+                        SmartScoreManage one = new SmartScoreManage();
+                        one.setTermId(result);
+                        one.setTerm(smartApply.getName());
+                        one.setScoreItem("为人师表");
+                        one.setParentId(data.getId());
+                        one.setScoreNum(3.0);
+                        scoreManageDetails.add(one);
+                        SmartScoreManage two = new SmartScoreManage();
+                        two.setTermId(result);
+                        two.setTerm(smartApply.getName());
+                        two.setScoreItem("关爱学生");
+                        two.setParentId(data.getId());
+                        two.setScoreNum(3.0);
+                        scoreManageDetails.add(two);
+                        SmartScoreManage three = new SmartScoreManage();
+                        three.setTermId(result);
+                        three.setTerm(smartApply.getName());
+                        three.setScoreItem("爱岗敬业");
+                        three.setParentId(data.getId());
+                        three.setScoreNum(6.0);
+                        scoreManageDetails.add(three);
+                        break;
+                    case "能":
+                        SmartScoreManage none = new SmartScoreManage();
+                        none.setTermId(result);
+                        none.setTerm(smartApply.getName());
+                        none.setScoreItem("基础能力");
+                        none.setParentId(data.getId());
+                        none.setScoreNum(1.0);
+                        scoreManageDetails.add(none);
+                        SmartScoreManage ntwo = new SmartScoreManage();
+                        ntwo.setTermId(result);
+                        ntwo.setTerm(smartApply.getName());
+                        ntwo.setScoreItem("教学能力");
+                        ntwo.setParentId(data.getId());
+                        ntwo.setScoreNum(16.0);
+                        scoreManageDetails.add(ntwo);
+                        SmartScoreManage nthree = new SmartScoreManage();
+                        nthree.setTermId(result);
+                        nthree.setTerm(smartApply.getName());
+                        nthree.setScoreItem("学习能力");
+                        nthree.setParentId(data.getId());
+                        nthree.setScoreNum(7.0);
+                        scoreManageDetails.add(nthree);
+                        SmartScoreManage nfour = new SmartScoreManage();
+                        nfour.setTermId(result);
+                        nfour.setTerm(smartApply.getName());
+                        nfour.setScoreItem("创新能力");
+                        nfour.setParentId(data.getId());
+                        nfour.setScoreNum(4.0);
+                        scoreManageDetails.add(nfour);
+                        break;
+                    case "勤":
+                        SmartScoreManage qone = new SmartScoreManage();
+                        qone.setTermId(result);
+                        qone.setTerm(smartApply.getName());
+                        qone.setScoreItem("考勤");
+                        qone.setParentId(data.getId());
+                        qone.setScoreNum(6.0);
+                        scoreManageDetails.add(qone);
+                        break;
+                    case "绩":
+                        SmartScoreManage jone = new SmartScoreManage();
+                        jone.setTermId(result);
+                        jone.setTerm(smartApply.getName());
+                        jone.setScoreItem("工作量");
+                        jone.setParentId(data.getId());
+                        jone.setScoreNum(8.0);
+                        scoreManageDetails.add(jone);
+                        SmartScoreManage jtwo = new SmartScoreManage();
+                        jtwo.setTermId(result);
+                        jtwo.setTerm(smartApply.getName());
+                        jtwo.setScoreItem("教学成绩");
+                        jtwo.setParentId(data.getId());
+                        jtwo.setScoreNum(30.0);
+                        scoreManageDetails.add(jtwo);
+                        SmartScoreManage jthree = new SmartScoreManage();
+                        jthree.setTermId(result);
+                        jthree.setTerm(smartApply.getName());
+                        jthree.setScoreItem("教研成果");
+                        jthree.setParentId(data.getId());
+                        jthree.setScoreNum(10.0);
+                        scoreManageDetails.add(jthree);
+                        SmartScoreManage jfour = new SmartScoreManage();
+                        jfour.setTermId(result);
+                        jfour.setTerm(smartApply.getName());
+                        jfour.setScoreItem("专业成长");
+                        jfour.setParentId(data.getId());
+                        jfour.setScoreNum(6.0);
+                        scoreManageDetails.add(jfour);
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            boolean inserSDetails = smartScoreManageService.saveBatch(scoreManageDetails);
+            if (!inserSDetails) {
+                //return CommonResult.fail("添加失败");
+                throw new Exception("添加失败！");
+            }
+            //endregion
+
+            //region 任课老师赋值
+            List<UserSubjectVo> teachings = smartTeachingService.querySmartTeachings(null);
+            if(teachings != null && teachings.size() > 0){
+                List<SmartEvaluateTeacher> sets = new ArrayList<>();
+                for (UserSubjectVo usv:teachings) {
+                    if(usv.getUserName() != null){
+                        SmartEvaluateTeacher set = new SmartEvaluateTeacher();
+                        set.setCardNo(usv.getCardNo());
+                        set.setName(usv.getUserName());
+                        set.setUserId(usv.getUserId());
+                        set.setGradeId(usv.getGradeId());
+                        set.setGradeName(usv.getGradeName());
+                        set.setTermId(smartApply.getId());
+                        set.setTerm(smartApply.getName());
+                        set.setSubjectId(usv.getSubjectId());
+                        set.setSubject(usv.getSubjectName());
+                        set.setClassId(usv.getClassId());
+                        set.setClassName(usv.getClassName());
+                        set.setTotalScore(0.0);
+                        set.setLowingScore(0.0);
+                        sets.add(set);
+                    }
+                }
+                if(sets != null && sets.size() > 0){
+                    boolean teacherBatch = smartEvaluateTeacherService.saveBatch(sets);
+                    if(!teacherBatch){
+                        throw new Exception("添加失败！");
+                    }
+                }
+            }
+            //endregion
+        }catch (Exception e) {
+            throw new Exception("添加失败！");
+        }
+
+        return CommonResult.ok("添加成功");
+    }
+
     /**
      * 更新学期
      *

src/main/java/com/template/model/request/addChildScoreManageRequest.java

@@ -0,0 +1,37 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 修改密码
+ */
+@Data
+public class addChildScoreManageRequest {
+
+    /**
+     * 主数据ID
+     */
+    @NotNull(message = "主数据ID不能为空")
+    private Integer id;
+
+    /**
+     * 学期ID
+     */
+    @NotNull(message = "学期ID不能为空")
+    private Integer termId;
+
+    /**
+     * 评分子项
+     */
+    @NotBlank(message = "评分子项不能为空")
+    private String scoreItem;
+
+    /**
+     * 分值
+     */
+    @NotNull(message = "分值不能为空")
+    private Double scoreNum;
+}

src/main/java/com/template/model/request/addScoreManageRequest.java

@@ -0,0 +1,36 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 修改密码
+ */
+@Data
+public class addScoreManageRequest {
+    /**
+     * 学期ID
+     */
+    @NotNull(message = "学期ID不能为空")
+    private Integer termId;
+
+    /**
+     * 评分项
+     */
+    @NotBlank(message = "评分项不能为空")
+    private String scoreItem;
+
+    /**
+     * 评分子项
+     */
+    @NotBlank(message = "评分子项不能为空")
+    private String scoreChildItem;
+
+    /**
+     * 分值
+     */
+    @NotNull(message = "分值不能为空")
+    private Double scoreNum;
+}

src/main/java/com/template/model/request/updateScoreManageRequest.java

@@ -0,0 +1,30 @@
+package com.template.model.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 修改密码
+ */
+@Data
+public class updateScoreManageRequest {
+    /**
+     * 数据ID
+     */
+    @NotNull(message = "数据ID不能为空")
+    private Integer id;
+
+    /**
+     * 评分子项
+     */
+    @NotBlank(message = "评分子项不能为空")
+    private String scoreItem;
+
+    /**
+     * 分值
+     */
+    @NotNull(message = "分值不能为空")
+    private Double scoreNum;
+}

src/main/java/com/template/model/tongji/MeterPage.java

@@ -9,6 +9,8 @@ public class MeterPage {
     public String meterId;
     public Double num;
     public String createTime;
+    public String address;
+    public String meterNo;
 
     public String getBuild() {
         return build;
@@ -49,4 +51,20 @@ public class MeterPage {
     public void setCreateTime(String createTime) {
         this.createTime = createTime;
     }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getMeterNo() {
+        return meterNo;
+    }
+
+    public void setMeterNo(String meterNo) {
+        this.meterNo = meterNo;
+    }
 }

src/main/java/com/template/services/SmartScoreManageService.java

@@ -42,4 +42,6 @@ public interface SmartScoreManageService extends IService<SmartScoreManage> {
     SimpleScoreDetailList queryNoTeacherScoreDetail(String term);
 
     List<SmartScoreManage> queryDatasByTermId(int termId);
+
+    List<SmartScoreManage> queryDatasByParentId(int parentId);
 }

src/main/java/com/template/services/impl/SmartScoreManageServiceImpl.java

@@ -36,7 +36,7 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
     @Override
     public int insertSmartScoreManage(SmartScoreManage sa) {
         int result = smartScoreManageMapper.insert(sa);
-        return result;
+        return sa.getId();
     }
 
     @Override
@@ -220,4 +220,12 @@ public class SmartScoreManageServiceImpl extends ServiceImpl<SmartScoreManageMap
         List<SmartScoreManage> result = smartScoreManageMapper.selectList(queryWrapper);
         return result;
     }
+
+    @Override
+    public List<SmartScoreManage> queryDatasByParentId(int parentId) {
+        QueryWrapper<SmartScoreManage> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("parent_id", parentId);
+        List<SmartScoreManage> result = smartScoreManageMapper.selectList(queryWrapper);
+        return result;
+    }
 }

src/main/resources/mapper/template/DriverStockMapper.xml

@@ -18,6 +18,8 @@
         <result property="meterName" column="meter_name"/>
         <result property="meterId" column="meter_id"/>
         <result property="num" column="num"/>
+        <result property="address" column="address"/>
+        <result property="meterNo" column="meter_no"/>
         <result property="createTime" column="create_time"/>
     </resultMap>
 
@@ -79,7 +81,7 @@ where a.deleted =0 and a.is_cancel = 0) c group by `name`
 
     <!--设备实时记录数据-->
     <select id="getMeterDetail" resultMap="MeterPage">
-        select e.name meter_name,c.meter_power num,d.`name` build,c.create_time from
+        select e.name meter_name,e.address,e.meter_no,c.meter_power num,d.`name` build,c.create_time from
             (select a.`meter_id`,a.`meter_power`,a.`create_time`,
                     b.`build_id` from `smart_meter_detail` a left join `smart_build_meter` b
                     on a.`meter_id`=b.`meter_id` where a.meter_type=#{meterType} and b.`meter_type`=#{meterType}