#G:移动物品选课上传

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -116,6 +116,14 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers( "/common/**").permitAll()
                 //网页注册登录接口放行
                 .antMatchers( "/web/artStudent/register","/web/artStudent/login").permitAll()
+
+
+
+                .antMatchers( "/wx/equipment/**").permitAll()
+
+
+
+
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolCirculation.java

@@ -16,6 +16,7 @@ import lombok.Data;
 public class SchoolCirculation extends OurBaseEntity
 {
 
+    private Long id;
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/domain/schoolEquipment/SchoolEquipmentRepair.java

@@ -16,6 +16,7 @@ import lombok.Data;
 public class SchoolEquipmentRepair extends OurBaseEntity
 {
 
+    private Long id;
     /** 设备id */
     private Long equipmentId;
 

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/equipment/SchoolReceiveMapper.java

+package yangtz.cs.liu.campus.mapper.equipment;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
+
+@Mapper
+public interface SchoolReceiveMapper extends BaseMapper<SchoolReceive> {
+
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/CirculationMapper.java

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.util.List;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
+@Mapper
 public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
+
+  @Select("SELECT sc.id,el.model,el.encode,sc.borrow_by,sc.borrow_time,return_time,sc.deadline,sc.return_equipment_condition ,sc.remark FROM school_circulation sc LEFT JOIN school_equipment_ledger el  on el.id = sc.equipment_id\n"
+      + "  LEFT JOIN  school_product_category pc on pc.classification_code = el.classification_code WHERE pc.admin_id=#{adminId}")
+  List<SchoolCirculationVo> getReturningEquipmentByadminId(@Param("adminId") Long adminId);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/mapper/schoolEquipment/EquipmentRepairMapper.java

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
+@Mapper
 public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
+
+  @Select("SELECT el.id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
+      + "el.classification_code,er.report_repair_time,er.report_repair_id,er.report_repair,er.problem,\n"
+      + "er.repair_id,er.evaluate,er.repair_name,er.repair_phone,er.repair_time,er.repair_state,er.remark\n"
+      + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}")
+  public SchoolEquipmentRepairVo getEquipmentById(@Param("id") Long id);
+
+
+
+  @Select("SELECT el.id,el.encode,er.repair_name,er.repair_time,er.repair_state\n"
+      + "FROM school_equipment_repair  er LEFT JOIN school_equipment_ledger  el ON er.equipment_id=el.id WHERE er.id=#{id}} ")
+  public SchoolEquipmentRepairVo getfeedback(@Param("id") Long id);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/equipment/SchoolReceiveService.java

+package yangtz.cs.liu.campus.service.equipment;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+
+/**
+ * 设备领用
+ */
+
+public interface SchoolReceiveService extends IService<SchoolReceive> {
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/equipment/SchoolReceiveServiceImpl.java

+package yangtz.cs.liu.campus.service.impl.equipment;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.mapper.equipment.SchoolReceiveMapper;
+import yangtz.cs.liu.campus.service.equipment.SchoolReceiveService;
+
+@Service
+public class SchoolReceiveServiceImpl extends
+    ServiceImpl<SchoolReceiveMapper, SchoolReceive> implements SchoolReceiveService {
+
+}

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/CirculationServiceImpl.java

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.CirculationMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 @Service
 public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
+
+
+  @Autowired
+  private CirculationMapper schoolCirculationMapper;
+  @Override
+  public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
+    return schoolCirculationMapper.getReturningEquipmentByadminId(userId);
+  }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/impl/schoolEquipment/EquipmentRepairServiceImpl.java

 package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper;
 import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 @Service
 public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMapper, SchoolEquipmentRepair> implements IEquipmentRepairService {
+
+  @Autowired
+  EquipmentRepairMapper equipmentRepairMapper;
+
+
+  @Override
+  public SchoolEquipmentRepairVo getEquipmentById(Long id) {
+    return equipmentRepairMapper.getEquipmentById(id);
+  }
+
+  @Override
+  public SchoolEquipmentRepairVo getfeedback(Long id) {
+    return equipmentRepairMapper.getfeedback(id);
+  }
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/ICirculationService.java

 package yangtz.cs.liu.campus.service.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 
 public interface ICirculationService extends IService<SchoolCirculation> {
+  List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.java

@@ -2,6 +2,10 @@ package yangtz.cs.liu.campus.service.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
 public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair> {
+  public SchoolEquipmentRepairVo getEquipmentById(Long id);
+
+  public SchoolEquipmentRepairVo getfeedback(Long id);
 }

smart-campus/src/main/java/yangtz/cs/liu/wechat/controller/equipment/EquipmentLeaseController.java

+package yangtz.cs.liu.wechat.controller.equipment;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.core.domain.AjaxResult;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolCirculation;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentRepair;
+import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.service.equipment.SchoolReceiveService;
+import yangtz.cs.liu.campus.service.schoolEquipment.ICirculationService;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentLedgerService;
+import yangtz.cs.liu.campus.service.schoolEquipment.IEquipmentRepairService;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
+
+/**
+ * 移动端，设备租借、领用
+ */
+@RestController
+@RequestMapping("/wx/equipment")
+public class EquipmentLeaseController {
+
+  @Autowired
+  IEquipmentLedgerService iEquipmentService;
+
+
+  @Autowired
+  IEquipmentRepairService iEquipmentRepairService;
+
+  @Autowired
+  ICirculationService iCirculationService;
+
+  @Autowired
+  SchoolReceiveService schoolReceiveService;
+
+  /**
+   * 扫码借用获取设备基本信息
+   */
+  @GetMapping("/getEquipment/{encode}")
+  private AjaxResult getEquipment(@PathVariable("encode") String encode){
+    LambdaQueryWrapper<SchoolEquipmentLedger> wrapper =  new LambdaQueryWrapper<>();
+    wrapper.eq(SchoolEquipmentLedger::getEncode,encode);
+    SchoolEquipmentLedger one = iEquipmentService.getOne(wrapper);
+    return AjaxResult.success(one);
+  }
+
+  /**
+   * 我的借用记录
+   */
+  @GetMapping("/getMyBorrowList/{borrowById}")
+  private AjaxResult getMyBorrowList(@PathVariable("borrowById") Integer borrowById){
+    LambdaQueryWrapper<SchoolCirculation> wrapper =  new LambdaQueryWrapper<>();
+    wrapper.eq(SchoolCirculation::getBorrowById,borrowById);
+    List<SchoolCirculation> list = iCirculationService.list(wrapper);
+    return AjaxResult.success(list);
+  }
+
+  /**
+   * 扫码借用
+   */
+  @PostMapping("/addRecord")
+  private AjaxResult addRecord(@RequestBody SchoolCirculation schoolCirculation){
+    Date borrowTime = schoolCirculation.getBorrowTime();
+    Long deadline = schoolCirculation.getDeadline();
+    Calendar calendar = Calendar.getInstance();
+    calendar.setTime(borrowTime);
+    calendar.add(Calendar.DATE,Integer.valueOf(deadline.toString()));
+    Date targetDate = calendar.getTime();
+
+    schoolCirculation.setReturnTime(targetDate);
+
+    boolean save = iCirculationService.save(schoolCirculation);
+    return AjaxResult.success(save);
+  }
+
+  /**
+   * 扫码借用查看
+   */
+  @GetMapping("/byCirculation/{id}")
+  private AjaxResult byCirculation(@PathVariable("id") Long id){
+    SchoolCirculation byId = iCirculationService.getById(id);
+    return AjaxResult.success(byId);
+  }
+
+  /**
+   * 领用台账list
+   */
+  @GetMapping("/getUseList/{recipientById}")
+  private AjaxResult getMyBorrowList(@PathVariable("recipientById") String recipientById){
+    LambdaQueryWrapper<SchoolReceive> wrapper =  new LambdaQueryWrapper<>();
+    wrapper.eq(SchoolReceive::getRecipientById,recipientById);
+    List<SchoolReceive> list = schoolReceiveService.list(wrapper);
+    return AjaxResult.success(list);
+  }
+
+  /**
+   * 领用台账查询
+   */
+  @GetMapping("/getUseById/{Id}")
+  private AjaxResult getUseById(@PathVariable("Id") Long Id){
+    SchoolReceive byId = schoolReceiveService.getById(Id);
+    return AjaxResult.success(byId);
+  }
+
+  /**
+   * 新增领用
+   */
+  @PostMapping("/addUsedevice")
+  private AjaxResult addUsedevice(@RequestBody SchoolReceive schoolReceive){
+    boolean save = schoolReceiveService.save(schoolReceive);
+    return AjaxResult.success(save);
+  }
+
+  /**
+   * 设备维修-列表
+   */
+  @GetMapping("/getMaintenanceList/{reportRepairid}")
+  private AjaxResult getMaintenanceList(@PathVariable("reportRepairid") Long reportRepairid){
+    LambdaQueryWrapper<SchoolEquipmentRepair> wrapper =  new LambdaQueryWrapper<>();
+    wrapper.eq(SchoolEquipmentRepair::getReportRepairId,reportRepairid);
+    List<SchoolEquipmentRepair> list = iEquipmentRepairService.list(wrapper);
+    return AjaxResult.success(list);
+  }
+
+  /**
+   * 设备维修-新增
+   */
+  @PostMapping("/addMaintenance")
+  private AjaxResult addMaintenance(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+    boolean save = iEquipmentRepairService.save(schoolEquipmentRepair);
+    return AjaxResult.success(save);
+  }
+
+  /**
+   * 设备报修台账查看
+   */
+  @GetMapping("/getMaintenance/{id}")
+  private AjaxResult getMaintenance(@PathVariable("id") Long id){
+    SchoolEquipmentRepairVo equipmentById = iEquipmentRepairService.getEquipmentById(id);
+    return AjaxResult.success(equipmentById);
+  }
+  /**
+   * 设备报修修改
+   */
+  @PutMapping("/pudateMaintenance")
+  private AjaxResult pudateMaintenance(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+    boolean save = iEquipmentRepairService.updateById(schoolEquipmentRepair);
+    return AjaxResult.success(save);
+  }
+  /**
+   * 报修台账反馈列表 设备维修记录id
+   */
+  @GetMapping("/getfeedback/{id}")
+  private AjaxResult getfeedback(@PathVariable("id") Long id){
+    SchoolEquipmentRepairVo equipmentById = iEquipmentRepairService.getEquipmentById(id);
+    return AjaxResult.success(equipmentById);
+  }
+
+  /**
+   * 报修反馈提交
+   */
+  @PutMapping("/pudateFeedback")
+  private AjaxResult pudateFeedback(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+    boolean b = iEquipmentRepairService.updateById(schoolEquipmentRepair);
+    return AjaxResult.success(b);
+  }
+
+  /**
+   * 维修人员更改维修状态
+   */
+  @PutMapping("/confirmRepair")
+  private AjaxResult confirmRepair(@RequestBody SchoolEquipmentRepair schoolEquipmentRepair){
+    boolean b = iEquipmentRepairService.updateById(schoolEquipmentRepair);
+    return AjaxResult.success(b);
+  }
+
+  /**
+   * 维修人员报修列表
+   */
+  @GetMapping("getMaintenanceUserList")
+  private AjaxResult getMaintenanceUserList(){
+    return AjaxResult.success(iEquipmentRepairService.list());
+  }
+
+  /**
+   * 管理员列表查询
+   */
+  @GetMapping("/getReturningEquipmentList/{userId}")
+  private AjaxResult getReturningEquipmentList(@PathVariable("userId") Long userId){
+    //根据管理员信息查看所有已借出设备信息
+    List<SchoolCirculationVo> returningEquipmentByadminId = iCirculationService
+        .getReturningEquipmentByadminId(userId);
+    return AjaxResult.success(returningEquipmentByadminId);
+  }
+
+  /**
+   * 管理员查看详情
+   */
+  @GetMapping("/getReturningEquipmentByList/{id}")
+  private AjaxResult getReturningEquipmentByList(@PathVariable("id") Long id){
+    //根据管理员信息查看信息详情
+    return AjaxResult.success(iCirculationService.getById(id));
+  }
+
+  /**
+   * 管理员归还操作
+   */
+  @PutMapping("returnDevice")
+  private AjaxResult returnDevice(@RequestBody SchoolCirculation schoolCirculation){
+    boolean b = iCirculationService.updateById(schoolCirculation);
+    return AjaxResult.success(b);
+  }
+
+}

smart-campus/src/main/resources/mapper/equipment/EquipmentRepairMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.schoolEquipment.EquipmentRepairMapper">
+    <resultMap type="SchoolEquipmentRepair" id="SchoolCirculationVoResult">
+        <result property="id" column="id"/>
+        <result property="equipmentId" column="equipment_id"/>
+        <result property="classificationCode" column="classification_code"/>
+        <result property="reportRepairTime" column="report_repair_time"/>
+        <result property="reportRepairId" column="report_repair_id"/>
+        <result property="reportRepair" column="report_repair"/>
+        <result property="problem" column="problem"/>
+        <result property="repairId" column="repair_id"/>
+        <result property="repairName" column="repair_name"/>
+        <result property="repairPhone" column="repair_phone"/>
+        <result property="repairTime" column="repair_time"/>
+        <result property="repairState" column="repair_state"/>
+        <result property="disposeState" column="dispose_state"/>
+        <result property="evaluate" column="evaluate"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
+
+
+
+
+</mapper>
\ No newline at end of file

smart-campus/src/main/resources/mapper/equipment/SchoolReceiveMapper.xml

+<?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="yangtz.cs.liu.campus.mapper.equipment.SchoolReceiveMapper">
+    <resultMap type="SchoolReceive" id="SchoolCirculationVoResult">
+        <result property="id" column="id"/>
+        <result property="equipmentId" column="equipment_id"/>
+        <result property="recipientTime" column="classification_code"/>
+        <result property="recipientById" column="unit"/>
+        <result property="recipientBy" column="affiliation_type"/>
+        <result property="returnTime" column="equipment_state"/>
+        <result property="returnEquipmentCondition" column="is_allow_lend"/>
+        <result property="receivedById" column="is_lend"/>
+        <result property="receivedBy" column="is_lend"/>
+        <result property="yjuseTime" column="is_lend"/>
+        <result property="sjuseTime" column="is_lend"/>
+        <result property="remark" column="is_lend"/>
+    </resultMap>
+</mapper>
\ No newline at end of file