Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

lxw

2023-05-23 d41ac4dcfd8254bc5db6add5b12c2fb72ccc0c39

Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0

 src/main/java/com/whyc/mapper/BaoJiGroupUserMapper.java

@@ -19,4 +19,7 @@
    List<UserInf> getUserListByRole(Set<Long> baoJiGroupIds, Integer role);

    List<BaoJiGroup> getGroupAndUserListWithDischargeFlag();

    Integer getGroupFlag(int userId);

}

 src/main/java/com/whyc/service/BaoJiGroupUserService.java

@@ -1,5 +1,6 @@
package com.whyc.service;

import com.google.gson.internal.$Gson$Types;
import com.whyc.mapper.BaoJiGroupUserMapper;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.BaoJiGroup;
@@ -64,4 +65,9 @@
    public List<BaoJiGroup> getGroupAndUserListWithDischargeFlag() {
        return mapper.getGroupAndUserListWithDischargeFlag();
    }

    public boolean getGroupFlag(int userId){
        Integer flag =  mapper.getGroupFlag(userId);
        return flag != null && flag == 1;
    }
}

 src/main/java/com/whyc/service/LoginService.java

@@ -19,6 +19,7 @@
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -46,6 +47,9 @@

    @Resource
    private MapOutlineService mapOutlineService;

    @Autowired
    private BaoJiGroupUserService baoJiGroupUserService;

    public Response login(String userName, String password, HttpServletRequest request) {
        UsernamePasswordToken userToken = new UsernamePasswordToken(userName, password);
@@ -285,6 +289,8 @@
                int permitGroupId = permitGroup.getPermitGroupId();
                dataList.add(permitGroupId);
            }
            //查询用户对应的班组标识
            dataList.add(baoJiGroupUserService.getGroupFlag(userInf.getUId().intValue()));
            //查询激活的地图
            String mapName = mapOutlineService.selectMapName();
            dataList.add(mapName);

 src/main/java/com/whyc/webSocket/taskPersonalWebSocket.java

@@ -57,9 +57,9 @@

    @OnMessage
    public void onMessage(Session session, String message) {
        //UserInf user = (UserInf) this.httpSession.getAttribute("user");
        //final int userId = user.getUId().intValue();
        final int userId = 1090;
        UserInf user = (UserInf) this.httpSession.getAttribute("user");
        final int userId = user.getUId().intValue();
        //final int userId = 1090;
        FaultUpload upload = ActionUtil.getGson().fromJson(message, FaultUpload.class);
        thread = new Thread("Thread_TaskPersonal") {
            @Override

 src/main/resources/mapper/BaoJiGroupUserMapper.xml

@@ -71,4 +71,10 @@
            </if>
        </foreach>
    </select>
    <select id="getGroupFlag" resultType="java.lang.Integer">
        select b.discharge_plan_flag from db_user.tb_user_battgroup_baojigroup_usr bu,db_user.tb_user_battgroup_baojigroup b
        where bu.baoji_group_id = b.baoji_group_id
        and b.discharge_plan_flag = 1
        and bu.uId = #{userId} limit 1
    </select>
</mapper>