apk调试
This commit is contained in:
parent
42eef81b7f
commit
523f01b8c4
|
|
@ -347,7 +347,7 @@ public class UserController {
|
|||
String user = "{'phone':'" + phones + "','pd':'" + passwords + "'}";
|
||||
JSONObject object = JSON.parseObject(user);
|
||||
// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null);
|
||||
String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/userLogin", object, null);
|
||||
String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/userLogin", object, null);
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
String string = JSONObject.parseObject(jsonObject.getString("data")).getString("token");
|
||||
return string;
|
||||
|
|
@ -361,7 +361,7 @@ public class UserController {
|
|||
userVo.setUserName(userName);
|
||||
userVo.setPhone(phone);
|
||||
userVo.setSystemName("健康体检");
|
||||
String permissionQuery = userService.getPermissionQuery(userVo);
|
||||
String permissionQuery = userService.getPermissionQuerys(userVo);
|
||||
userVo.setAuth(permissionQuery);
|
||||
userVo.setIsBlacklist("0");
|
||||
userVo.setAccountStatus("1");
|
||||
|
|
@ -371,7 +371,7 @@ public class UserController {
|
|||
String params = "{'params':'" + encrypt + "'}";
|
||||
JSONObject object = JSON.parseObject(params);
|
||||
// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token);
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
String code = jsonObject.getString("code");
|
||||
System.err.println("新增code="+code);
|
||||
|
|
@ -436,7 +436,7 @@ public class UserController {
|
|||
String params = "{'params':'" + encrypt + "'}";
|
||||
JSONObject object = JSON.parseObject(params);
|
||||
// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/delUser", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/delUser", object, token);
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
String code = jsonObject.getString("code");
|
||||
System.err.println("删除code="+code);
|
||||
|
|
|
|||
|
|
@ -78,6 +78,12 @@ public interface UserDao {
|
|||
|
||||
String getPermissionQuery(UnifyBean userVo);
|
||||
|
||||
List<UnifyBean> getPushByBackOfficePersonnel();
|
||||
|
||||
int updateUserBackstagePushStatus(List<UnifyBean> list);
|
||||
|
||||
String getPermissionQuerys(UnifyBean userVo);
|
||||
|
||||
//统一权限新增
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -34,4 +34,6 @@ public interface UserService {
|
|||
void updateUnify(Long id);
|
||||
|
||||
String getPermissionQuery(UnifyBean userVo);
|
||||
|
||||
String getPermissionQuerys(UnifyBean userVo);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,7 +76,8 @@ public class UserServiceImpl implements UserService {
|
|||
log.debug("修改{}的密码", username);
|
||||
}
|
||||
|
||||
@Transactional
|
||||
@Override
|
||||
@Transactional
|
||||
public SysUser updateUser(UserDto userDto) {
|
||||
userDao.update(userDto);
|
||||
saveUserRoles(userDto.getId(), userDto.getRoleIds());
|
||||
|
|
@ -172,4 +173,13 @@ public class UserServiceImpl implements UserService {
|
|||
return userDao.getPermissionQuery(userVo);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param userVo
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public String getPermissionQuerys(UnifyBean userVo) {
|
||||
return userDao.getPermissionQuerys(userVo);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -71,6 +71,8 @@ public class UtilServiceImpl implements UtilService {
|
|||
*/
|
||||
@Override
|
||||
public List<MapBean> getNewHospitalSelect(MapBean bean) {
|
||||
String hospiral = UserUtil.getLoginUser().getHospitalId();
|
||||
bean.setHospitalId(hospiral);
|
||||
return utilDao.getNewHospitalSelect(bean);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,9 @@ import java.time.LocalDate;
|
|||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author 19814
|
||||
*/
|
||||
@Configuration
|
||||
@EnableScheduling
|
||||
@Slf4j
|
||||
|
|
@ -115,7 +118,7 @@ public class UnifyTask {
|
|||
log.info("操作日志数据="+result);
|
||||
}
|
||||
|
||||
// @Scheduled(fixedRate = 1000*60*60)
|
||||
@Scheduled(cron = "0 0 2 * * ?")
|
||||
@PostConstruct
|
||||
@Async
|
||||
public void physicalExaminationPersonnel() throws Exception {
|
||||
|
|
@ -138,20 +141,50 @@ public class UnifyTask {
|
|||
// 根据索引范围获取当前分组的元素,并调用接口处理分组数据
|
||||
List<UnifyBean> group = list.subList(fromIndex, toIndex);
|
||||
|
||||
physicalExaminationPush(group,token);
|
||||
physicalExaminationPush(group,token, "1");
|
||||
}
|
||||
} else {
|
||||
log.info("无体检人员数据");
|
||||
}
|
||||
}
|
||||
|
||||
private void physicalExaminationPush(List<UnifyBean> list, String token) throws Exception {
|
||||
@Scheduled(cron = "0 0 1 * * ?")
|
||||
@PostConstruct
|
||||
@Async
|
||||
public void pushByBackOfficePersonnel() throws Exception {
|
||||
log.info("--------定时统一后台人员数据扫描器启动------");
|
||||
//查询某日登录日志数据
|
||||
List<UnifyBean> list = userDao.getPushByBackOfficePersonnel();
|
||||
if (!list.isEmpty()) {
|
||||
//获取登录的token
|
||||
String token = UserController.login();
|
||||
// 每组的大小
|
||||
int groupSize = 20;
|
||||
// 总的分组数
|
||||
int totalGroups = (int) Math.ceil((double) list.size() / groupSize);
|
||||
// 遍历分组
|
||||
for (int i = 0; i < totalGroups; i++) {
|
||||
// 计算当前分组元素的起始索引
|
||||
int fromIndex = i * groupSize;
|
||||
// 计算当前分组元素的结束索引,确保不超过总元素数
|
||||
int toIndex = Math.min((i + 1) * groupSize, list.size());
|
||||
// 根据索引范围获取当前分组的元素,并调用接口处理分组数据
|
||||
List<UnifyBean> group = list.subList(fromIndex, toIndex);
|
||||
|
||||
physicalExaminationPush(group,token, "2");
|
||||
}
|
||||
} else {
|
||||
log.info("无体检人员数据");
|
||||
}
|
||||
}
|
||||
|
||||
private void physicalExaminationPush(List<UnifyBean> list, String token,String auth) throws Exception {
|
||||
String s = JSON.toJSONString(list);
|
||||
String encrypt = AESCBCUtils.encrypt(s, AESCBCUtils.sKey);
|
||||
String params = "{'params':'" + encrypt + "'}";
|
||||
JSONObject object = JSON.parseObject(params);
|
||||
// String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putOperaLog", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token);
|
||||
String result = HttpClientUtils.doHttpPost("http://112.29.103.165:1616/ynuw/sys/api/putUser", object, token);
|
||||
// String result = HttpClientUtils.doHttpPost("http://192.168.0.14:27018/ynuw/sys/api/putUser", object, token);
|
||||
//推送成功改推送状态
|
||||
JSONObject jsonObject = JSONObject.parseObject(result);
|
||||
String code = jsonObject.getString("code");
|
||||
|
|
@ -168,7 +201,11 @@ public class UnifyTask {
|
|||
}
|
||||
}
|
||||
}
|
||||
int i = userDao.updateUserPushStatus(list);
|
||||
if (auth.equals("1")) {
|
||||
int i = userDao.updateUserPushStatus(list);
|
||||
} else {
|
||||
int i = userDao.updateUserBackstagePushStatus(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -193,11 +193,8 @@
|
|||
telep_number AS phone,
|
||||
'健康体检' AS systemName,
|
||||
CASE
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1')
|
||||
AND EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台, 移动端'
|
||||
WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台'
|
||||
WHEN EXISTS (SQL:1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') THEN '移动端'
|
||||
ELSE '不存在'
|
||||
WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = telep_number AND is_active = '1') THEN '后台, 移动端'
|
||||
ELSE '移动端'
|
||||
END AS auth,
|
||||
'0' AS isBlacklist,
|
||||
'1' AS accountStatus,
|
||||
|
|
@ -206,13 +203,45 @@
|
|||
WHERE is_active = '1' AND pushStatus != 1
|
||||
</select>
|
||||
<select id="getPermissionQuery" resultType="java.lang.String">
|
||||
SELECT CASE
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') AND
|
||||
EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台, 移动端'
|
||||
WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台'
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1')
|
||||
THEN '移动端'
|
||||
ELSE '不存在'
|
||||
END AS source
|
||||
FROM pm_base_physical
|
||||
WHERE telep_number = #{phone}
|
||||
AND is_active = '1'
|
||||
</select>
|
||||
<select id="getPushByBackOfficePersonnel" resultType="com.bonus.boot.manager.manager.entity.UnifyBean">
|
||||
SELECT
|
||||
username AS userName,
|
||||
phone AS phone,
|
||||
'健康体检' AS systemName,
|
||||
CASE
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') AND EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台, 移动端'
|
||||
WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台'
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') THEN '移动端'
|
||||
ELSE '不存在'
|
||||
END AS source;
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE phone = telep_number AND is_active = '1') THEN '后台, 移动端'
|
||||
ELSE '后台'
|
||||
END AS auth,
|
||||
'0' AS isBlacklist,
|
||||
'1' AS accountStatus,
|
||||
'1' AS status
|
||||
FROM sys_user
|
||||
WHERE is_active = '1' AND is_push != 1
|
||||
</select>
|
||||
<select id="getPermissionQuerys" resultType="java.lang.String">
|
||||
SELECT CASE
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1') AND
|
||||
EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台, 移动端'
|
||||
WHEN EXISTS (SELECT 1 FROM sys_user WHERE phone = #{phone} AND is_active = '1') THEN '后台'
|
||||
WHEN EXISTS (SELECT 1 FROM pm_base_physical WHERE telep_number = #{phone} AND is_active = '1')
|
||||
THEN '移动端'
|
||||
ELSE '不存在'
|
||||
END AS source
|
||||
FROM sys_user
|
||||
WHERE phone = #{phone}
|
||||
AND is_active = '1'
|
||||
</select>
|
||||
|
||||
<insert id="addInfo" keyProperty="userId" useGeneratedKeys="true">
|
||||
|
|
@ -278,5 +307,10 @@
|
|||
UPDATE pm_base_physical SET `pushStatus`= #{user.status} WHERE telep_number = #{user.phone} and is_active = '1'
|
||||
</foreach>
|
||||
</update>
|
||||
<update id="updateUserBackstagePushStatus">
|
||||
<foreach collection="list" item="user" separator=";">
|
||||
UPDATE sys_user SET `is_push`= #{user.status} WHERE phone = #{user.phone} and is_active = '1'
|
||||
</foreach>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
Loading…
Reference in New Issue