Parcourir la source

add visitor interface

tags/v0.8.5^2
yk il y a 2 ans
Parent
révision
b071bd8c35
5 fichiers modifiés avec 47 ajouts et 0 suppressions
  1. +3
    -0
      xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java
  2. +9
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java
  3. +30
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java
  4. +1
    -0
      xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/mapper/DmVisitRecordsMapper.java
  5. +4
    -0
      xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitRecordsMapper.xml

+ 3
- 0
xueyi-api/xueyi-api-system/src/main/java/com/xueyi/system/api/staff/feign/RemoteVisitorService.java Voir le fichier

@@ -33,6 +33,9 @@ public interface RemoteVisitorService {
public JSONObject visitList(@RequestParam(value = "empId") Long empId,
@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

@GetMapping(value = "/visit/inner-api/list-all")
public JSONObject visitListAll(@RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

@PostMapping(value = "/visit/inner-api/send-sms")
public JSONObject sendSms(@RequestParam(value = "type") Integer type, @RequestHeader(SecurityConstants.ENTERPRISE_ID) Long enterpriseId, @RequestHeader(SecurityConstants.SOURCE_NAME) String sourceName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

+ 9
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorApiController.java Voir le fichier

@@ -58,6 +58,15 @@ public class DmVisitorApiController extends BaseApiController {

}

@GetMapping(value = "list-all")
@ResponseBody
public JSONObject visitList(String devId){
DeviceTenantSourceMergeVo vo = super.getDeviceTenantSourceMergeVo(devId);

return visitorService.visitListAll(vo.getTenantId(), vo.getSourceSlave(), SecurityConstants.INNER);

}

@PostMapping(value = "new-visitor")
@ResponseBody
public JSONObject newVisit(@RequestBody DmVisitCommonDto commonDto){


+ 30
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/controller/api/DmVisitorInnerApiController.java Voir le fichier

@@ -225,6 +225,36 @@ public class DmVisitorInnerApiController extends BaseApiController {
return outputSuccess(json).toJSON();
}

@InnerAuth
@GetMapping(value = "list-all")
public com.alibaba.fastjson2.JSONObject visitListAll(){
List<DmVisitRecordsPo> v = dmVisitRecordsMapper.findList();

JSONObject json = new JSONObject();
List<DmVisitRecordsDto> dtos = new ArrayList<>();

v.forEach(item->{
DmStaffPo e = dmStaffMapper.selectById(item.getUserId());
DmVisitRecordsDto d = recordsConverter.mapperDto(item);
if (null != e) {
d.setUserPhone(e.getPhone());
d.setUserName(e.getUserName());
}

DmVisitorsPo visitorsPo = dmVisitorsMapper.selectById(item.getVisitorId());
if (null != visitorsPo) {
d.setVisitorName(visitorsPo.getName());
}
if (null != item.getVisitDate()) {
d.setVisitDateStr(DateUtils.formatDate(item.getVisitDate(), "yyyy-MM-dd"));
}
dtos.add(d);
});
json.put("data", dtos);

return outputSuccess(json).toJSON();
}

@Autowired
private DmTenantReceiverMapper receiverMapper;



+ 1
- 0
xueyi-modules/xueyi-system/src/main/java/com/xueyi/system/staff/mapper/DmVisitRecordsMapper.java Voir le fichier

@@ -20,4 +20,5 @@ public interface DmVisitRecordsMapper extends BaseMapper<DmVisitRecordsQuery, Dm
DmVisitRecordsPo findByName(@Param("visitorName") String visitorName/*, @Param("userId") Long userId*/);

List<DmVisitRecordsPo> findByEmp(@Param("userId") Long userId);
List<DmVisitRecordsPo> findList();
}

+ 4
- 0
xueyi-modules/xueyi-system/src/main/resources/mapper/staff/DmVisitRecordsMapper.xml Voir le fichier

@@ -11,4 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select * from dm_visit_records u where u.user_id = #{userId} and (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE)
</select>

<select id="findList" parameterType="Object" resultType="DmVisitRecordsPo">
select * from dm_visit_records u where (visit_date >= CURRENT_DATE or create_time >= CURRENT_DATE)
</select>

</mapper>

Chargement…
Annuler
Enregistrer