新增i健康分支

app/app-iot-server/src/main/java/com/yihu/ehr/iot/controller/common/LoginController.java

@@ -47,12 +47,12 @@ public class LoginController extends BaseController{
     * @param password
     * @return
     */
    @RequestMapping(value = "/submit", method = RequestMethod.POST)
    @RequestMapping(method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation(value = "登录验证")
    public Result login(HttpServletRequest request,
            @ApiParam(name = "userName", value = "登录账号")
            @RequestParam(value = "userName") String userName,
            @ApiParam(name = "username", value = "登录账号")
            @RequestParam(value = "username") String userName,
            @ApiParam(name = "password", value = "密码")
            @RequestParam(value = "password") String password) {
            return loginService.loginyanshi(request, userName, password);

app/app-iot-server/src/main/java/com/yihu/ehr/iot/service/common/LoginService.java

@@ -114,6 +114,7 @@ public class LoginService extends BaseService {
            }
            Map userMap = new HashMap<>();
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("id", user.getCode());
            jsonObject.put("username", user.getMobile());
@@ -122,6 +123,9 @@ public class LoginService extends BaseService {
            userMap.put("user", jsonObject);
            result.setData(userMap);
            String userId = user.getCode();
            //获取token
            initUrlInfo(request);
            AccessToken token = new AccessToken();
@@ -129,6 +133,13 @@ public class LoginService extends BaseService {
            token.setExpiresIn(999999999);
            token.setRefreshToken(UUID.randomUUID().toString().replace("-", ""));
            JSONObject obj = new JSONObject();
            obj.put("id", user.getCode());
            obj.put("token",token.getAccessToken());
            result.setObj(obj);
            request.getSession().setAttribute("isLogin", true);
            request.getSession().setAttribute("token", token);
            request.getSession().setAttribute("loginName", userName);

app/app-iot-server/src/main/java/com/yihu/ehr/iot/yanshi/config/WlyyJpa.java

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.persistence.EntityManagerFactory;
import javax.sql.DataSource;
import java.util.Properties;
/**
 * Created by chenweida on 2017/4/6.
@@ -40,14 +41,15 @@ public class WlyyJpa {
        emfb.setPersistenceUnitName("wlyy");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);
        emfb.setJpaProperties(hibernateProperties.hibProperties());
        Properties properties = new Properties();
        properties.putAll(hibernateProperties.hibProperties());
        properties.put("hibernate.ejb.naming_strategy","org.hibernate.cfg.DefaultNamingStrategy");
        emfb.setJpaProperties(properties);
        return emfb;
    }
    @Bean(name = "wlyyTransactionManager")
    @Primary
    JpaTransactionManager transactionManagerSecondary(

app/app-iot-server/src/main/java/com/yihu/ehr/iot/yanshi/dao/UserDao.java

@@ -17,6 +17,7 @@ import java.util.List;
public interface UserDao extends PagingAndSortingRepository<User, Long>, JpaSpecificationExecutor<User> {
	@Query("from User a where a.mobile = ?1")
	User findByMobile(String mobile);
	
	User findByCode(String code);

app/app-iot-server/src/main/java/com/yihu/ehr/iot/yanshi/model/User.java

@@ -179,6 +179,7 @@ public class User extends IdEntity {
        return ImmutableList.copyOf(StringUtils.split("", ","));
    }
    @Column(name = "job_no")
    public String getJobNo() {
        return jobNo;
    }

app/app-iot-server/src/main/resources/application.yml

@@ -64,3 +64,9 @@ fast-dfs:
    max-size: 20
    wait-time: 500
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: false
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

app/app-iot-server/src/main/webapp/front/js/scripts/login.js

@@ -3,7 +3,7 @@
 */
var loginRelyOn = ['jquery', 'layer', 'vue', 'jsHelper', 'apiServer', 'promise', 'bootstrap', 'validate'];
require(loginRelyOn, function ($, layer, vue, jsHelper, apiServer, Promise) {
   jsHelper.setLayerCon();
    jsHelper.setLayerCon();
    var load = null;
    var loginApp = new vue({
        el: '#loginApp',
@@ -13,40 +13,41 @@ require(loginRelyOn, function ($, layer, vue, jsHelper, apiServer, Promise) {
        },
        methods: {
            setLoad: function () {
                load =layer.load(1, {
                    shade: [0.5,'#000']
                load = layer.load(1, {
                    shade: [0.5, '#000']
                });
            },
            sendFun: function () {
                if (this.userID == '') {
                    this.tips('请输入账号', '#lUAn');
                    return ;
                    return;
                }
                if (this.password == '') {
                    this.tips('请输入密码', '#lUPwd');
                    return ;
                    return;
                }
                this.setLoad();
                apiServer.login({
                    data:{
                    data: {
                        "username": this.userID,
                        "password": this.password
                    }
                }).then(function (res) {
                    layer.close(load);
                    if (res.successFlg) {
                        debugger
                        sessionStorage.setItem("ZF_UID",res.obj.id);
                        sessionStorage.setItem("ZF_UN",res.obj.realName);
                        sessionStorage.setItem("ZF_U",res.obj);
                        location.href = apiServer.indexPage();
                        sessionStorage.setItem("ZF_UID", res.obj.id);
                        sessionStorage.setItem("ZF_UN", res.obj.realName);
                        sessionStorage.setItem("ZF_U", res.obj);
                        var indexurl = apiServer.indexPage();
                        console.info(indexurl)
                        location.href = indexurl;
                    } else {
                        layer.msg(res.message);
                    }
                });
            },
            tips: function (msg, id) {
                layer.tips(msg, id,{
                layer.tips(msg, id, {
                    tips: [2, '#ff5722'],
                    time: 1000
                });