Merge branch 'master' of 49.232.152.146:xhxy/smart_school

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

@@ -116,14 +116,6 @@ 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/controller/SchoolEquipment/EquipmentLedgerController.java

@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.controller.SchoolEquipment;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -129,4 +130,13 @@ public class EquipmentLedgerController extends BaseController {
         return AjaxResult.success(message);
     }
 
+    /**
+     * 获取用户
+     * @return
+     */
+    @GetMapping("/getUser")
+    public TableDataInfo getUser(SysUser sysUser){
+        startPage();
+        return getDataTable(equipmentLedgerService.getUser(sysUser));
+    }
 }

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 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.SchoolReceive;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolCirculationVo;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
@@ -10,4 +13,14 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 public interface SchoolReceiveMapper extends BaseMapper<SchoolReceive> {
 
 
+  @Select("SELECT el.encode,el.equipment_name,el.model,sr.recipient_by,sr.recipient_time from school_receive sr LEFT JOIN school_equipment_ledger el on sr.equipment_id = el.id \n"
+      + "WHERE sr.recipient_by_id = #{recipientById}")
+  List<SchoolReceiveVo> getRecipientByIdlist(@Param("recipientById") String recipientById);
+
+
+
+  @Select("SELECT el.encode,el.equipment_name,el.model,sr.recipient_by,sr.recipient_time from school_receive sr LEFT JOIN school_equipment_ledger el on sr.equipment_id = el.id \n"
+      + "WHERE sr.id = #{id}")
+  SchoolReceiveVo getRecipientById(@Param("id") Long id);
+
 }

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;
 
-import java.util.List;
-
+@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);
-
-    /**
+    /*
      * 查看设备借出归还列表
      * @param schoolCirculationVo
      * @return
@@ -34,4 +30,13 @@ public interface CirculationMapper extends BaseMapper<SchoolCirculation> {
      * @return
      */
     int deleteSchoolCirculationByIds(Long[] ids);
+  @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);
+
+
+  @Select(" SELECT el.encode,el.equipment_name,el.model,sc.borrow_time ,sc.borrow_by, sc.purpose,sc.deadline ,\n"
+      + "sc.return_equipment_condition,sc.return_time,sc.remark  FROM school_circulation sc LEFT JOIN school_equipment_ledger el on sc.equipment_id = el.id\n"
+      + "WHERE sc.id =#{id} ")
+  SchoolCirculationVo getSchoolCirculationVoById(@Param("id")Long id);
 }

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

 package yangtz.cs.liu.campus.mapper.schoolEquipment;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger> {
     /**
@@ -20,4 +22,11 @@ public interface EquipmentLedgerMapper extends BaseMapper<SchoolEquipmentLedger>
      * @return
      */
     int outSchoolEquipmentLedger(Long[] ids);
+
+    /**
+     * 获取用户
+     * @return
+     */
+    List<Map<String, String>> getUser(SysUser sysUser);
+
 }

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 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.SchoolEquipmentRepair;
@@ -11,15 +13,24 @@ import java.util.Map;
 
 public interface EquipmentRepairMapper extends BaseMapper<SchoolEquipmentRepair> {
 
-    @Select("SELECT el.id,el.encode,el.equipment_name,el.model,el.date_of_production,el.place ,\n"
+  @Select("SELECT er.id,er.equipment_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);
+  @Select("SELECT er.id,er.equipment_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.report_repair_id=#{reportRepairid}")
+  public List<SchoolEquipmentRepairVo> getMaintenanceList(@Param("reportRepairid") Long reportRepairid);
+
+  @Select("SELECT er.id,er.equipment_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")
+  public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
+
     /**
      * 查看设备报修列表
      * @param schoolEquipmentRepairVo

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

@@ -2,7 +2,9 @@ package yangtz.cs.liu.campus.service.equipment;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 
 /**
  * 设备领用
@@ -10,4 +12,7 @@ import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolReceive;
 
 public interface SchoolReceiveService extends IService<SchoolReceive> {
 
+  List<SchoolReceiveVo> getRecipientByIdlist(String recipientById );
+
+  SchoolReceiveVo getRecipientById(Long id );
 }

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 java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 
 @Service
 public class SchoolReceiveServiceImpl extends
     ServiceImpl<SchoolReceiveMapper, SchoolReceive> implements SchoolReceiveService {
 
+  @Autowired
+  SchoolReceiveMapper mapper;
+  @Override
+  public List<SchoolReceiveVo> getRecipientByIdlist(String recipientById) {
+    return mapper.getRecipientByIdlist(recipientById);
+  }
+
+  @Override
+  public SchoolReceiveVo getRecipientById(Long id) {
+    return mapper.getRecipientById(id);
+  }
 }

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

@@ -16,8 +16,19 @@ import java.util.List;
 @Service
 public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, SchoolCirculation> implements ICirculationService {
 
+
   @Autowired
   private CirculationMapper circulationMapper;
+  @Override
+  public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
+    return circulationMapper.getReturningEquipmentByadminId(userId);
+  }
+
+  @Override
+  public SchoolCirculationVo getSchoolCirculationVoById(Long id) {
+    return circulationMapper.getSchoolCirculationVoById(id);
+  }
+
 
     /**
      * 查看设备借出归还列表
@@ -72,8 +83,4 @@ public class CirculationServiceImpl extends ServiceImpl<CirculationMapper, Schoo
         return circulationMapper.deleteSchoolCirculationByIds(ids);
     }
 
-    @Override
-    public List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId) {
-        return circulationMapper.getReturningEquipmentByadminId(userId);
-    }
 }

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

@@ -3,6 +3,7 @@ package yangtz.cs.liu.campus.service.impl.schoolEquipment;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.DataScope;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.exception.base.BaseException;
 import com.ruoyi.common.utils.DateUtils;
@@ -24,6 +25,7 @@ import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
 
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMapper, SchoolEquipmentLedger> implements IEquipmentLedgerService {
@@ -228,4 +230,13 @@ public class EquipmentLedgerServiceImpl extends ServiceImpl<EquipmentLedgerMappe
             throw new BaseException(failureMsg.toString());
         }
     }
+
+    /**
+     * 获取用户
+     * @return
+     */
+    @Override
+    public List<Map<String, String>> getUser(SysUser sysUser) {
+        return equipmentLedgerMapper.getUser(sysUser);
+    }
 }

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

@@ -104,7 +104,13 @@ public class EquipmentRepairServiceImpl extends ServiceImpl<EquipmentRepairMappe
   }
 
   @Override
-    public SchoolEquipmentRepairVo getfeedback(Long id) {
-        return equipmentRepairMapper.getfeedback(id);
+  public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid) {
+    return equipmentRepairMapper.getMaintenanceList(reportRepairid);
   }
+
+  @Override
+  public List<SchoolEquipmentRepairVo> getMaintenanceUserList() {
+    return equipmentRepairMapper.getMaintenanceUserList();
+  }
+
 }

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;
 
 import java.util.List;
 
 public interface ICirculationService extends IService<SchoolCirculation> {
+
+  List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
+
+  SchoolCirculationVo getSchoolCirculationVoById(Long id);
     /**
      * 查看设备借出归还列表
      * @param schoolCirculationVo
@@ -42,5 +47,4 @@ public interface ICirculationService extends IService<SchoolCirculation> {
      */
     int deleteSchoolCirculationByIds(Long[] ids);
 
-    List<SchoolCirculationVo> getReturningEquipmentByadminId(Long userId);
 }

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

 package yangtz.cs.liu.campus.service.schoolEquipment;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import yangtz.cs.liu.campus.domain.schoolEquipment.SchoolEquipmentLedger;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentLedgerVo;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger> {
 
@@ -61,4 +63,11 @@ public interface IEquipmentLedgerService extends IService<SchoolEquipmentLedger>
      * @param list
      */
     void checkImport(List<SchoolEquipmentLedger> list);
+
+    /**
+     * 获取用户
+     * @return
+     */
+    List<Map<String,String>> getUser(SysUser sysUser);
+
 }

smart-campus/src/main/java/yangtz/cs/liu/campus/service/schoolEquipment/IEquipmentRepairService.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.SchoolEquipmentRepair;
 import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolEquipmentRepairVo;
 
@@ -57,6 +58,10 @@ public interface IEquipmentRepairService extends IService<SchoolEquipmentRepair>
 
     public SchoolEquipmentRepairVo getEquipmentById(Long id);
 
-    public SchoolEquipmentRepairVo getfeedback(Long id);
+  public List<SchoolEquipmentRepairVo> getMaintenanceList(Long reportRepairid);
+
+
+  public List<SchoolEquipmentRepairVo> getMaintenanceUserList();
+
 
 }

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

@@ -25,6 +25,7 @@ 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;
+import yangtz.cs.liu.campus.vo.schoolEquipment.SchoolReceiveVo;
 
 /**
  * 移动端，设备租借、领用
@@ -79,10 +80,12 @@ public class EquipmentLeaseController {
     calendar.setTime(borrowTime);
     calendar.add(Calendar.DATE,Integer.valueOf(deadline.toString()));
     Date targetDate = calendar.getTime();
-
     schoolCirculation.setReturnTime(targetDate);
-
     boolean save = iCirculationService.save(schoolCirculation);
+   //修改设备表借出状态
+    SchoolEquipmentLedger byId = iEquipmentService.getById(schoolCirculation.getEquipmentId());
+    byId.setIsLend("1");
+    iEquipmentService.updateById(byId);
     return AjaxResult.success(save);
   }
 
@@ -91,7 +94,7 @@ public class EquipmentLeaseController {
    */
   @GetMapping("/byCirculation/{id}")
   private AjaxResult byCirculation(@PathVariable("id") Long id){
-    SchoolCirculation byId = iCirculationService.getById(id);
+    SchoolCirculationVo byId = iCirculationService.getSchoolCirculationVoById(id);
     return AjaxResult.success(byId);
   }
 
@@ -100,10 +103,10 @@ public class EquipmentLeaseController {
    */
   @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);
+
+    List<SchoolReceiveVo> recipientByIdlist = schoolReceiveService
+        .getRecipientByIdlist(recipientById);
+    return AjaxResult.success(recipientByIdlist);
   }
 
   /**
@@ -111,7 +114,7 @@ public class EquipmentLeaseController {
    */
   @GetMapping("/getUseById/{Id}")
   private AjaxResult getUseById(@PathVariable("Id") Long Id){
-    SchoolReceive byId = schoolReceiveService.getById(Id);
+    SchoolReceiveVo byId = schoolReceiveService.getRecipientById(Id);
     return AjaxResult.success(byId);
   }
 
@@ -129,10 +132,9 @@ public class EquipmentLeaseController {
    */
   @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);
+    List<SchoolEquipmentRepairVo> maintenanceList = iEquipmentRepairService
+        .getMaintenanceList(reportRepairid);
+    return AjaxResult.success(maintenanceList);
   }
 
   /**
@@ -192,7 +194,9 @@ public class EquipmentLeaseController {
    */
   @GetMapping("getMaintenanceUserList")
   private AjaxResult getMaintenanceUserList(){
-    return AjaxResult.success(iEquipmentRepairService.list());
+    List<SchoolEquipmentRepairVo> maintenanceUserList = iEquipmentRepairService
+        .getMaintenanceUserList();
+    return AjaxResult.success(maintenanceUserList);
   }
 
   /**
@@ -221,6 +225,10 @@ public class EquipmentLeaseController {
   @PutMapping("returnDevice")
   private AjaxResult returnDevice(@RequestBody SchoolCirculation schoolCirculation){
     boolean b = iCirculationService.updateById(schoolCirculation);
+    //修改设备表借出状态
+    SchoolEquipmentLedger byId = iEquipmentService.getById(schoolCirculation.getEquipmentId());
+    byId.setIsLend("0");
+    iEquipmentService.updateById(byId);
     return AjaxResult.success(b);
   }
 

smart-campus/src/main/resources/mapper/schoolEquipment/EquipmentLedgerMapper.xml

@@ -52,4 +52,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </update>
+
+    <select id="getUser" resultType="Map" parameterType="com.ruoyi.common.core.domain.entity.SysUser">
+        SELECT
+            user_id as userId,
+            user_name as userName,
+            phonenumber as phone
+        FROM
+            sys_user
+        WHERE
+            del_flag = '0'
+            AND `status` = '0'
+        <if test="userName != null and userName != ''">
+            AND user_name like concat('%', #{userName}, '%')
+        </if>
+    </select>
 </mapper>